rpms/audacious-plugins/devel audacious-sid.desktop, NONE, 1.1 audacious-plugins.spec, 1.65, 1.66

Michael Schwendt mschwendt at fedoraproject.org
Wed Dec 2 13:46:49 UTC 2009 

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7697

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-sid.desktop 
Log Message:
* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
- Move SID music plugin into audacious-plugins-sid package. Its 
  built with libsidplay 1 while 3rd party package providers may
  build it with libsidplay 2.
- Include metronome plugin in base plugins package. No reason to
  split this off into an optional subpackage.



--- NEW FILE audacious-sid.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play SID music
Exec=audacious
Icon=audacious2
MimeType=audio/prs.sid;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- audacious-plugins.spec	25 Nov 2009 15:27:43 -0000	1.65
+++ audacious-plugins.spec	2 Dec 2009 13:46:49 -0000	1.66
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -20,6 +20,7 @@ License: GPLv2 and GPLv2+ and LGPLv2+ an
 # Disabled via options where possible, see %%build.
 Source0: audacious-plugins-fedora-%{version}.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 Patch1: audacious-plugins-2.2-jack.patch
@@ -51,6 +52,7 @@ BuildRequires: libcddb-devel
 BuildRequires: libmtp-devel
 BuildRequires: libxml2-devel
 BuildRequires: gettext
+BuildRequires: desktop-file-utils
 
 # experimental, disabled by default
 BuildRequires: neon-devel
@@ -64,16 +66,23 @@ Obsoletes: audacious-plugins-arts
 Obsoletes: audacious-plugins-pulseaudio <= 1.3.5
 Provides: audacious-plugins-pulseaudio = %{version}
 
+# obsolete old subpackage -- no reason to split this off
+Obsoletes: audacious-plugins-metronome < 2.2-2
+Provides: audacious-plugins-metronome = %{version}-%{release}
+
+
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins. It is based on ("forked off") BMP.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 This package provides essential plugins for audio input, audio output and
 visualization.
 
 
 %package jack
-Summary: Audacious output plugin for JACK sound service
+Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-jack <= 1.1.2
@@ -81,11 +90,11 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description jack
 This package provides an Audacious output plugin that uses the
-JACK sound service.
+Jack Audio Connection Kit (JACK) sound service.
 
 
 %package esd
-Summary: Audacious output plugin for esd sound service
+Summary: Audacious output plugin for EsounD service
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-esd <= 1.1.2
@@ -93,50 +102,51 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description esd
 This package provides an Audacious output plugin that uses the
-ESD sound server.
+EsounD service.
 
 
 %package amidi
-Summary: Audacious input plugin for amidi
+Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description amidi
-This package provides an Audacious input plugin that uses the
-amidi sound service.
-
+This package provides AMIDI-Plug, a modular MIDI music player, as an
+input plugin for Audacious.
 
 
-%package wavpack
-Summary: Audacious input plugin for wavpack
+%package sid
+Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-%description wavpack
-This package provides an Audacious input plugin that reads WavPack
-compressed files.
+%description sid
+This package provides an Audacious input plugin for SID music files.
 
+This build of the plugin uses libsidplay 1. 3rd party package
+providers may build it with libsidplay 2.
 
 
-%package metronome
-Summary: Audacious input plugin simulating a metronome
+%package wavpack
+Summary: Audacious input plugin for WavPack compressed files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
-%description metronome
-This package provides an Audacious input plugin that simulates
-a metronome.
-
+%description wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
 
 
 %package vortex
-Summary: Audacious input plugin for vortex audio files
+Summary: Audacious input plugin for Vortex format files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description vortex
-This package provides an Audacious input plugin that reads
-vortex compressed files.
+This package provides an Audacious input plugin that reads files
+in Vortex (.vtx) format.
 
 
 
@@ -174,12 +184,23 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
+# audacious-sid.desktop
+desktop-file-install --vendor "" \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    %{SOURCE1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post sid
+update-desktop-database &> /dev/null || :
+
+%postun sid
+update-desktop-database &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -193,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/wavpack.so
-%exclude %{_libdir}/audacious/Input/metronom.so
+%exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Output/jackout.so
 %exclude %{_libdir}/audacious/Output/ESD.so
@@ -212,13 +233,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 
-%files wavpack
+%files sid
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wavpack.so
+%{_libdir}/audacious/Input/sid.so
+%{_datadir}/applications/audacious-sid.desktop
 
-%files metronome
+%files wavpack
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/metronom.so
+%{_libdir}/audacious/Input/wavpack.so
 
 %files vortex
 %defattr(-,root,root,-)
@@ -226,6 +248,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Move SID music plugin into audacious-plugins-sid package. Its 
+  built with libsidplay 1 while 3rd party package providers may
+  build it with libsidplay 2.
+- Include metronome plugin in base plugins package. No reason to
+  split this off into an optional subpackage.
+
 * Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
 - Upgrade to 2.2 (declared as the next "stable release" after 2.1).
 - The ladspa plugin has been reworked since beta2.

More information about the fedora-extras-commits mailing list