From 82dd4a5760d48a0266b6f6e81ca8f15f8ac4e4b1 Mon Sep 17 00:00:00 2001 From: Callum Lerwick Date: Sep 10 2006 21:51:38 +0000 Subject: - New upstream version. - Enable SDL driver, this indirectly gives ALSA support, however it is rather unstable so we can't kill off the OSS driver just yet. - Compiling with jack support crashes on startup, even if the jack driver is not enabled. --- diff --git a/.cvsignore b/.cvsignore index 8c3c75b..50bce34 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ soundtracker-0.6.7.tar.gz +soundtracker-0.6.8.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 0a3cc54..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned 2006-06-20 since owner has never signed up. diff --git a/soundtracker-0.6.8-no-setuid.patch b/soundtracker-0.6.8-no-setuid.patch new file mode 100644 index 0000000..0ca8ccd --- /dev/null +++ b/soundtracker-0.6.8-no-setuid.patch @@ -0,0 +1,12 @@ +diff -ur soundtracker-0.6.8/app/Makefile.in soundtracker-0.6.8.patch/app/Makefile.in +--- soundtracker-0.6.8/app/Makefile.in 2006-02-25 07:37:15.000000000 -0600 ++++ soundtracker-0.6.8.patch/app/Makefile.in 2006-08-12 23:55:14.000000000 -0500 +@@ -665,7 +665,7 @@ + + install-data-am: + +-install-exec-am: install-binPROGRAMS install-exec-local ++install-exec-am: install-binPROGRAMS + + install-info: install-info-recursive + diff --git a/soundtracker-automake.patch b/soundtracker-automake.patch deleted file mode 100644 index 81fdf61..0000000 --- a/soundtracker-automake.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- ./app/drivers/Makefile.am.nos 2003-08-27 21:24:44.000000000 +0200 -+++ ./app/drivers/Makefile.am 2003-08-27 21:25:17.000000000 +0200 -@@ -1,36 +1,36 @@ - - noinst_LIBRARIES = libdrivers.a - --libdrivers_a_SOURCES = dummy-drivers.c file-output.c - - if DRIVER_OSS -- libdrivers_a_SOURCES += oss-output.c oss-input.c -+ libdrivers_src1 = oss-output.c oss-input.c - endif - - if DRIVER_ALSA -- libdrivers_a_SOURCES += alsa-output.c alsa-input.c -+ libdrivers_src2 = alsa-output.c alsa-input.c - endif - - if DRIVER_ALSA_050 -- libdrivers_a_SOURCES += alsa2-output.c alsa2-input.c -+ libdrivers_src3 = alsa2-output.c alsa2-input.c - endif - - if DRIVER_ESD -- libdrivers_a_SOURCES += esd-output.c -+ libdrivers_src4 = esd-output.c - endif - - if DRIVER_JACK -- libdrivers_a_SOURCES += jack-output.c -+ libdrivers_src5 = jack-output.c - endif - - if DRIVER_IRIX -- libdrivers_a_SOURCES += irix-output.c -+ libdrivers_src6 = irix-output.c - endif - - if DRIVER_SUN -- libdrivers_a_SOURCES += sun-output.c sun-input.c -+ libdrivers_src7 = sun-output.c sun-input.c - endif - -+libdrivers_a_SOURCES = dummy-drivers.c file-output.c $(libdrivers_src1) $(libdrivers_src2) $(libdrivers_src3) $(libdrivers_src4) $(libdrivers_src5) $(libdrivers_src6) $(libdrivers_src7) - INCLUDES = -I.. ${ST_S_JACK_INCLUDES} - - EXTRA_DIST = dsound-output.c ---- ./app/Makefile.am.nos 2003-08-27 21:24:40.000000000 +0200 -+++ ./app/Makefile.am 2003-08-27 21:24:51.000000000 +0200 -@@ -2,7 +2,7 @@ - - bin_PROGRAMS = soundtracker - --soundtracker_SOURCES = \ -+soundtracker_src = \ - audio.c audio.h \ - audioconfig.c audioconfig.h \ - cheat-sheet.c cheat-sheet.h \ -@@ -42,46 +42,21 @@ - xm-player.c xm-player.h - - if !NO_GDK_PIXBUF -- soundtracker_SOURCES += scalablepic.c scalablepic.h -+ soundtracker_src1 = scalablepic.c scalablepic.h - endif - - if DRIVER_ALSA_050 -- soundtracker_SOURCES += midi-050.c midi-utils-050.c midi-settings-050.c \ -+ soundtracker_src2 = midi-050.c midi-utils-050.c midi-settings-050.c \ - midi.h midi-settings.h midi-utils.h - endif - - if DRIVER_ALSA_09x -- soundtracker_SOURCES += midi-09x.c midi-utils-09x.c midi-settings-09x.c \ -+ soundtracker_src3 = midi-09x.c midi-utils-09x.c midi-settings-09x.c \ - midi.h midi-settings.h midi-utils.h - endif -- -+soundtracker_SOURCES = $(soundtracker_src) $(soundtracker_src1) $(soundtracker_src2) $(soundtracker_src3) - soundtracker_LDADD = drivers/libdrivers.a mixers/libmixers.a ${ST_S_JACK_LIBS} - --install-exec-local: -- case `uname` in \ -- OpenBSD) \ -- chown root.wheel $(bindir)/soundtracker; \ -- ;; \ -- NetBSD) \ -- chown root.wheel $(bindir)/soundtracker; \ -- ;; \ -- Darwin) \ -- chown root:admin $(bindir)/soundtracker; \ -- ;; \ -- *) \ -- chown root.root $(bindir)/soundtracker; \ -- ;; \ -- esac -- chmod +s $(bindir)/soundtracker -- @echo "" -- @echo "***" -- @echo "*** Installing SoundTracker suid root." -- @echo "*** This improves sound responsivity, but may be a security risk" -- @echo "*** if this is a multi-user machine. See file INSTALL." -- @echo "***" -- @echo "" -- -- - stdir = $(datadir)/soundtracker - - #INCLUDES = -DDATADIR=\"$(stdir)\" \ diff --git a/soundtracker-mkinstalldirs.patch b/soundtracker-mkinstalldirs.patch deleted file mode 100644 index 3e2469b..0000000 --- a/soundtracker-mkinstalldirs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur soundtracker-0.6.7-pre6-orig/po/Makefile.in.in soundtracker-0.6.7-pre6/po/Makefile.in.in ---- soundtracker-0.6.7-pre6-orig/po/Makefile.in.in 2002-05-20 18:39:24.000000000 +0200 -+++ soundtracker-0.6.7-pre6/po/Makefile.in.in 2003-11-16 00:05:14.000000000 +0100 -@@ -26,7 +26,7 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKINSTALLDIRS = ./mkinstalldirs - mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` - - CC = @CC@ - diff --git a/soundtracker.spec b/soundtracker.spec index 0e89319..7bef9a0 100644 --- a/soundtracker.spec +++ b/soundtracker.spec @@ -1,20 +1,23 @@ -Name: soundtracker -Version: 0.6.7 -Release: 5 - -Summary: Sound module composer/player - -Group: Applications/Multimedia -License: GPL -URL: http://www.soundtracker.org/ -Source0: http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.7.tar.gz -Source1: soundtracker.desktop -Patch0: soundtracker-automake.patch -Patch1: soundtracker-mkinstalldirs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk+-devel gdk-pixbuf-devel audiofile-devel esound-devel libsndfile-devel -BuildRequires: automake autoconf desktop-file-utils gettext-devel +Name: soundtracker +Version: 0.6.8 +Release: 1%{?dist} + +Summary: Sound module composer/player + +Group: Applications/Multimedia +License: GPL +URL: http://www.soundtracker.org/ +Source0: http://www.soundtracker.org/dl/v0.6/soundtracker-%{version}.tar.gz +Source1: soundtracker.desktop +Patch0: soundtracker-0.6.8-no-setuid.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk+-devel +BuildRequires: gdk-pixbuf-devel +BuildRequires: libsndfile-devel +#BuildRequires: jack-audio-connection-kit-devel +BuildRequires: SDL-devel +BuildRequires: desktop-file-utils %description Soundtracker is a module tracker for the X Window System similar to @@ -23,42 +26,46 @@ format. The user interface makes use of GTK+. %prep %setup -q -%patch0 -%patch1 -p1 +%patch -p1 %build -aclocal -automake -autoconf #We're at Gnome 2, no need for Gnome1 support. -%configure --disable-gnome --disable-asm --disable-alsa --disable-jack +%configure --disable-gnome --disable-asm make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall -%find_lang %{name} +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications +%find_lang soundtracker + +install -d -m0755 %{buildroot}/%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ + --dir %{buildroot}/%{_datadir}/applications \ %SOURCE1 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f %{name}.lang +%files -f soundtracker.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING FAQ NEWS TODO README -%{_bindir}/* -%{_datadir}/applications/* -%{_datadir}/%{name}/ +%doc AUTHORS COPYING FAQ NEWS README TODO +%{_bindir}/soundtracker +%{_datadir}/applications/fedora-soundtracker.desktop +%{_datadir}/soundtracker/ %changelog +* Sun Aug 13 2006 Callum Lerwick - 0.6.8-1 +- New upstream version. +- Enable SDL driver, this indirectly gives ALSA support, however it is rather + unstable so we can't kill off the OSS driver just yet. +- Compiling with jack support crashes on startup, even if the jack driver is + not enabled. + * Sun May 22 2005 Jeremy Katz - 0.6.7-5 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt 0.6.7-4 - rebuilt * Wed Nov 10 2004 Michael Schwendt - 0:0.6.7-3 @@ -66,14 +73,18 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 2 2004 Nils O. Selåsdal - 0:0.6.7-0.fdr.2 - 0.6.7.0.fdr.1 was not based on latest -pre rpm. Fixes build errors. + * Thu Jan 29 2004 Nils O. Selåsdal - 0:0.6.7-0.fdr.1 - 0.6.7 release + * Mon Nov 17 2003 Nils O. Selåsdal - 0:0.6.7-0.fdr.0.4.pre6 - Revert soundtracker-mkinstalldirs.patch to patch provided by Michael Schwendt, Now builds on RH9 again. + * Fri Nov 14 2003 Nils O. Selåsdal - 0:0.6.7-0.fdr.0.3.pre6 - add soundtracker-mkinstalldirs.patch that prevents po/Makefile.in.in from doing funny things. Now builds on FC1. + * Sat Aug 30 2003 Nils O. Selåsdal - 0:0.6.7-0.fdr.0.2.pre6 - Remove old and painful changelogs from doc, - Don't use macros for commands run within the .spec file @@ -89,4 +100,3 @@ rm -rf $RPM_BUILD_ROOT - Initial RPM release for Fedora - Rework Makefile.am's to work with recent autotools and to not install setuid root - diff --git a/sources b/sources index cc6a3fa..0bce187 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9a5685e0a79fb10066d29baed652d324 soundtracker-0.6.7.tar.gz +1e5a2ef689e214933e53f687b3a199bb soundtracker-0.6.8.tar.gz