rpms/timidity++/devel fedora-timidity.desktop, 1.1, 1.2 timidity++.spec, 1.15, 1.16

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	fedora-timidity.desktop timidity++.spec 
Log Message:
* Sat Oct 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-4
- Split the patches of into a seperate sub package so that they can be used
  by other wavetable midi synthesizers, without dragging in a bunch of unwanted
  dependencies (bz 250735)
- There is no reason to install the icon in /usr/share/pixmaps if it also gets
  installed under /usr/share/icons



Index: fedora-timidity.desktop
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/fedora-timidity.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-timidity.desktop	12 Oct 2007 12:50:46 -0000	1.1
+++ fedora-timidity.desktop	13 Oct 2007 07:27:13 -0000	1.2
@@ -1,10 +1,8 @@
 [Desktop Entry]
-Name=TiMidty++
+Name=TiMidity++
 Comment=Real-time software synthesizer
-Icon=/usr/share/pixmaps/timidity.xpm
+Icon=timidity
 Type=Application
-Exec=/usr/bin/timidity -ig -Os
+Exec=timidity -ig
 Terminal=false
-Categories=Application;Audio;AudioVideo;Midi;X-Synthesis;X-Jack;X-Fedora;
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.12
+Categories=Audio;AudioVideo;Midi;X-Synthesis;X-Jack;


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- timidity++.spec	12 Oct 2007 12:50:46 -0000	1.15
+++ timidity++.spec	13 Oct 2007 07:27:13 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 3%{?dist}
+Release: 4%{?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
@@ -18,14 +18,27 @@
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: timidity++-X11
-BuildRequires: arts-devel esound-devel autoconf alsa-lib-devel ncurses-devel
-BuildRequires: desktop-file-utils gtk2-devel
+BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel
+BuildRequires: desktop-file-utils
+Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme
 
 %description
 TiMidity++ is a MIDI format to wave table format converter and
 player. Install timidity++ if you'd like to play MIDI files and your
 sound card does not natively support wave table format.
 
+
+%package        patches
+Summary:        Instrument (patch) files for %{name}
+Group:          Applications/Multimedia
+
+%description    patches
+This package contains samples of instruments (called patches) for use in
+wavetable midi synthesizers like %{name}. These patches are in the Gravis
+Ultasound .pat format and can be used by any wavetable midi synthesizer which
+understands this format.
+
+
 %prep
 %setup -q -n TiMidity++-%{version}
 # Put config files etc. to sane locations
@@ -37,6 +50,7 @@
 %patch6 -p1 -b .warnings
 %patch7 -p1 -b .esd
 
+
 %build
 export EXTRACFLAGS="$RPM_OPT_FLAGS"
 %configure --enable-dynamic --disable-dependency-tracking \
@@ -46,56 +60,71 @@
 	--enable-gtk
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
 ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg
-cd $RPM_BUILD_ROOT%{_datadir}/timidity
+pushd $RPM_BUILD_ROOT%{_datadir}/timidity
 tar xvjf %{SOURCE1}
 bzip2 -dck %{SOURCE3} >instruments/britepno.pat
 bzip2 -dck %{SOURCE4} >instruments/pistol.pat
+popd
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora              \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
   %{SOURCE5}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 644 $RPM_BUILD_DIR/TiMidity++-%{version}/interface/pixmaps/timidity.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/timidity.xpm
-install -m 644 $RPM_BUILD_DIR/TiMidity++-%{version}/interface/pixmaps/timidity.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
+install -m 644 interface/pixmaps/timidity.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 # update icon themes
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 # update icon themes
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
-%defattr(-,root,root)
-%config(noreplace) /etc/timidity.cfg
+%defattr(-,root,root,-)
 %{_bindir}/*
-%{_datadir}/timidity
 %{_mandir}/*/*
 %{_datadir}/applications/fedora-timidity.desktop
-%{_datadir}/pixmaps/timidity.xpm
 %{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
 
+%files patches
+%defattr(-,root,root,-)
+%config(noreplace) /etc/timidity.cfg
+%{_datadir}/timidity
+
 
 %changelog
+* Sat Oct 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-4
+- Split the patches of into a seperate sub package so that they can be used
+  by other wavetable midi synthesizers, without dragging in a bunch of unwanted
+  dependencies (bz 250735)
+- There is no reason to install the icon in /usr/share/pixmaps if it also gets
+  installed under /usr/share/icons
+
 * Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-3
 - fix typo in package description (#185328) 
 - use RPM_OPT_FLAGS, make debuginfo package usable (#249968),