rpms/soundtracker/FC-5 soundtracker-0.6.8-no-setuid.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 soundtracker.spec, 1.9, 1.10 sources, 1.2, 1.3 soundtracker-automake.patch, 1.1, NONE soundtracker-mkinstalldirs.patch, 1.1, NONE

[Callum Lerwick (seg)]

Author: seg

Update of /cvs/extras/rpms/soundtracker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15363

Modified Files:
	.cvsignore soundtracker.spec sources 
Added Files:
	soundtracker-0.6.8-no-setuid.patch 
Removed Files:
	soundtracker-automake.patch soundtracker-mkinstalldirs.patch 
Log Message:
* Sun Sep 10 2006 Callum Lerwick <seg at haxxed.com> - 0.6.8-2
- --disable-asm breaks x86_64 builds.

* Sun Aug 13 2006 Callum Lerwick <seg at haxxed.com> - 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.


soundtracker-0.6.8-no-setuid.patch:

--- NEW FILE soundtracker-0.6.8-no-setuid.patch ---
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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundtracker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:21:32 -0000	1.2
+++ .cvsignore	17 Jan 2007 15:58:51 -0000	1.3
@@ -1 +1 @@
-soundtracker-0.6.7.tar.gz
+soundtracker-0.6.8.tar.gz


Index: soundtracker.spec
===================================================================
RCS file: /cvs/extras/rpms/soundtracker/FC-5/soundtracker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- soundtracker.spec	23 May 2005 00:27:07 -0000	1.9
+++ soundtracker.spec	17 Jan 2007 15:58:51 -0000	1.10
@@ -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: 2%{?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,49 @@
 
 %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
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-%find_lang %{name}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+%find_lang soundtracker
 
-install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
+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 Sep 10 2006 Callum Lerwick <seg at haxxed.com> - 0.6.8-2
+- --disable-asm breaks x86_64 builds.
+
+* Sun Aug 13 2006 Callum Lerwick <seg at haxxed.com> - 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 <katzj at redhat.com> - 0.6.7-5
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.6.7-4
 - rebuilt
 
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.6.7-3
@@ -66,14 +76,18 @@
 
 * Mon Feb 2 2004 Nils O. Selåsdal <NOS at Utel.no> - 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 <NOS at Utel.no> - 0:0.6.7-0.fdr.1
 - 0.6.7 release
+
 * Mon Nov 17 2003 Nils O. Selåsdal <NOS at Utel.no> - 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 <NOS at Utel.no>  - 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 <NOS at Utel.no> - 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 +103,3 @@
 - Initial RPM release for Fedora
 - Rework Makefile.am's to work with recent autotools and to not
   install setuid root
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundtracker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:21:32 -0000	1.2
+++ sources	17 Jan 2007 15:58:51 -0000	1.3
@@ -1 +1 @@
-9a5685e0a79fb10066d29baed652d324  soundtracker-0.6.7.tar.gz
+1e5a2ef689e214933e53f687b3a199bb  soundtracker-0.6.8.tar.gz


--- soundtracker-automake.patch DELETED ---


--- soundtracker-mkinstalldirs.patch DELETED ---