rpms/timidity++/devel fedora-timidity.desktop, NONE, 1.1 timidity++.spec, 1.14, 1.15

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	timidity++.spec 
Added Files:
	fedora-timidity.desktop 
Log Message:
* 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),
  thanks to Ville Skitta
- compile with GTK interface (#231745), thanks to Brian Jedsen




--- NEW FILE fedora-timidity.desktop ---
[Desktop Entry]
Name=TiMidty++
Comment=Real-time software synthesizer
Icon=/usr/share/pixmaps/timidity.xpm
Type=Application
Exec=/usr/bin/timidity -ig -Os
Terminal=false
Categories=Application;Audio;AudioVideo;Midi;X-Synthesis;X-Jack;X-Fedora;
Encoding=UTF-8
X-Desktop-File-Install-Version=0.12


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- timidity++.spec	24 Sep 2007 12:03:06 -0000	1.14
+++ timidity++.spec	12 Oct 2007 12:50:46 -0000	1.15
@@ -1,13 +1,14 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 2%{?dist}
+Release: 3%{?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
 Source2: timidity.cfg
 Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2
 Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2
+Source5: fedora-timidity.desktop
 URL: http://timidity.sourceforge.net
 Patch: TiMidity++-2.13.0-redhat.patch
 Patch3: TiMidity++-2.13.0-detect.patch
@@ -18,10 +19,11 @@
 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
 
 %description
 TiMidity++ is a MIDI format to wave table format converter and
-player. Install timitidy++ if you'd like to play MIDI files and your
+player. Install timidity++ if you'd like to play MIDI files and your
 sound card does not natively support wave table format.
 
 %prep
@@ -36,13 +38,12 @@
 %patch7 -p1 -b .esd
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export LDFLAGS="-s"
-autoconf
-%configure --enable-dynamic \
-	--enable-interface=ncurses,slang,vt100,alsaseq,server,network \
+export EXTRACFLAGS="$RPM_OPT_FLAGS"
+%configure --enable-dynamic --disable-dependency-tracking \
+	--enable-interface=ncurses,slang,vt100,alsaseq,server,network,gtk \
 	--enable-audio=oss,arts,alsa,esd,vorbis \
-	--with-default-output=alsa
+	--with-default-output=alsa \
+	--enable-gtk
 make
 
 %install
@@ -57,20 +58,53 @@
 bzip2 -dck %{SOURCE3} >instruments/britepno.pat
 bzip2 -dck %{SOURCE4} >instruments/pistol.pat
 
+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
+
 %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 || :
+
+%postun
+# update icon themes
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
 %files
 %defattr(-,root,root)
 %config(noreplace) /etc/timidity.cfg
 %{_bindir}/*
 %{_datadir}/timidity
 %{_mandir}/*/*
+%{_datadir}/applications/fedora-timidity.desktop
+%{_datadir}/pixmaps/timidity.xpm
+%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
+
 
 %changelog
+* 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),
+  thanks to Ville Skitta
+- compile with GTK interface (#231745), thanks to Brian Jedsen
+  
 * Mon Sep 24 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-2
 - spec/license fixes
-
+  
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.2
 - rebuild