Author: goetz
Date: Sat Nov 25 16:48:34 2006
New Revision: 87267

Modified:
   packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec

Log:
merge extra-plugins package in main one


Modified: packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec
==============================================================================
--- packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec      
(original)
+++ packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec      
Sat Nov 25 16:48:34 2006
@@ -48,6 +48,10 @@
 BuildRequires:  libwavpack-devel
 Provides:      beep-media-player-libvisual beep-media-player-lirc 
audacious-modplug beep-media-player-scrobbler audacious-scrobbler
 Obsoletes:     beep-media-player-libvisual beep-media-player-lirc 
audacious-modplug beep-media-player-scrobbler audacious-scrobbler
+%if %build_plf
+Provides:beep-media-player-mp4 audacious-extra-plugins
+Obsoletes:beep-media-player-mp4 audacious-extra-plugins
+%endif
 
 %description
 Audacious is a media player based on the BMP music playing application.
@@ -141,20 +145,6 @@
 This is a fluidsynth backend for the Audacious Media Player to support the
 playback of MIDI files with the fluidsynth engine.
 
-%package  -n audacious-extra-plugins
-Summary: Additional input plugins for Audacious
-Group: Sound
-Requires: audacious
-Provides:beep-media-player-mp4
-Obsoletes:beep-media-player-mp4
-Epoch: %epoch
-
-%description  -n audacious-extra-plugins
-This contains additional input plugins for Audacious to support the MP4/AAC
-and WMA audio formats.
-
-This package is in PLF as it violates some patents.
-
 %package  -n audacious-sid
 Group: Sound
 Summary: Audacious input plugin for C64 SID files
@@ -262,6 +252,10 @@
 #
 %{_libdir}/audacious/Input/libsexypsf.so
 #
+%if %build_plf
+%_libdir/audacious/Input/libaac.so
+%_libdir/audacious/Input/libwma.so
+%endif
 %dir %{_libdir}/audacious/Effect/
 %{_libdir}/audacious/Effect/libaudiocompress.so
 %{_libdir}/audacious/Effect/libecho.so
@@ -301,13 +295,6 @@
 %defattr(0644,root,root,0755)
 %{_libdir}/audacious/Output/libpulse_audio.so
 
-%if %build_plf
-%files  -n audacious-extra-plugins
-%defattr(0644,root,root,0755)
-%_libdir/audacious/Input/libaac.so
-%_libdir/audacious/Input/libwma.so
-%endif
-
 %files  -n audacious-sid
 %defattr(-,root,root)
 %{_libdir}/audacious/Input/libsid.so

Reply via email to