rpms/timidity++/devel timidity++.spec,1.19,1.20

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2141

Modified Files:
	timidity++.spec 
Log Message:
* Thu Jan 24 2008 Jindrich Novy <jnovy at redhat.com> 2.13.2-7
- merge review fixes, thanks to Mamoru Tasaka: (#226492)
  - update License tag (still unclear what to do with GUS patches)
  - remove useless unversioned obsolete timidity++-X11
  - substitute /etc with %%{_sysconfdir}
  - enable parallel build
  - preserve timestamps, tar unpacking is no more verbose
  - add docs
- try to avoid the ppc64 build hacks



Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- timidity++.spec	11 Dec 2007 10:29:45 -0000	1.19
+++ timidity++.spec	25 Jan 2008 10:31:09 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
@@ -23,14 +23,11 @@
 Patch12: TiMidity++-2.13.2-mlutil.patch
 Patch13: TiMidity++-2.13.2-flac.patch
 
-License: GPLv2
+License: GPLv2 and MIT and BSD
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: timidity++-X11
 BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel
 BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel
-%ifnarch ppc64
 BuildRequires: jack-audio-connection-kit-devel
-%endif
 BuildRequires: desktop-file-utils
 Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme
 
@@ -68,29 +65,29 @@
 %patch12 -p1
 %patch13 -p1
 
+# Ensure that we are actually using %%_sysconfdir
+sed -i -e 's|/etc/timidity\.cfg|%{_sysconfdir}/timidity.cfg|' \
+timidity/timidity.h
+
 
 %build
 export EXTRACFLAGS="$RPM_OPT_FLAGS"
 %configure --enable-dynamic --disable-dependency-tracking \
-	--enable-interface=ncurses,vt100,alsaseq,server,network,gtk \
-%ifnarch ppc64
-	--enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac
-%else
-	--enable-audio=oss,arts,alsa,esd,ao,vorbis,speex,flac
-%endif
+  --enable-interface=ncurses,vt100,alsaseq,server,network,gtk \
+  --enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
 ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg
 pushd $RPM_BUILD_ROOT%{_datadir}/timidity
-tar xvjf %{SOURCE1}
+tar xjf %{SOURCE1}
 bzip2 -dck %{SOURCE3} >instruments/britepno.pat
 bzip2 -dck %{SOURCE4} >instruments/pistol.pat
 popd
@@ -101,7 +98,7 @@
   %{SOURCE5}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 644 interface/pixmaps/timidity.xpm \
+install -p -m 644 interface/pixmaps/timidity.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
 
 
@@ -126,6 +123,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc AUTHORS COPYING README NEWS ChangeLog
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/applications/fedora-timidity.desktop
@@ -138,6 +136,16 @@
 
 
 %changelog
+* Thu Jan 24 2008 Jindrich Novy <jnovy at redhat.com> 2.13.2-7
+- merge review fixes, thanks to Mamoru Tasaka: (#226492)
+  - update License tag (still unclear what to do with GUS patches)
+  - remove useless unversioned obsolete timidity++-X11
+  - substitute /etc with %%{_sysconfdir}
+  - enable parallel build
+  - preserve timestamps, tar unpacking is no more verbose
+  - add docs
+- try to avoid the ppc64 build hacks
+
 * Tue Dec 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-6
 - Disable building of the jack output on powerpc64, as that mysteriously fails
   to build there.