- removed bogus O (those are completely different plugins)

[packages/audacious-plugins.git] / audacious-plugins.spec

diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 54e35b3d2bc4caffab4eeb925e56f3f4de5ff857..d8d371dd9a5bd3544914718b1acda2bc20e5f096 100644 (file)
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -1,21 +1,23 @@
 # TODO:
 # - build oss4 plugin
+# /usr/lib64/audacious/Effect/sox-resampler.so
+# /usr/lib64/audacious/Visualization/gl-spectrum.so
+# - stop subpackages madness(?)
 #
 # Conditional build:
 %bcond_without bs2b            # BS2B effect plugin
 %bcond_with    jack0           # JACK 0.12x instead of JACK 2
-%bcond_with    sidplay1        # libsidplay 1.x instead of libsidplay2
 #
-%define                audver  3.3.4
+%define                audver  3.4
 Summary:       Plugins for Audacious media player (metapackage)
 Summary(pl.UTF-8):     Wtyczki dla odtwarzacza multimedialnego Audacious (metapakiet)
 Name:          audacious-plugins
-Version:       3.3.4
+Version:       3.4
 Release:       2
 License:       GPL v2+, LGPL v2+, GPL v3, MIT, BSD (see individual plugins)
 Group:         X11/Applications/Sound
 Source0:       http://distfiles.audacious-media-player.org/%{name}-%{version}.tar.bz2
-# Source0-md5: c7fc344b802557cbbe208c31e5289ef1
+# Source0-md5: ea59b4023f32ca096519d01b8f6f33c0
 Patch0:                %{name}-verbose_make.patch
 URL:           http://audacious-media-player.org/
 BuildRequires: audacious-devel >= %{audver}
@@ -79,11 +81,7 @@ BuildRequires:       libogg-devel >= 2:1.0
 # effect-resample, effect-speed-pitch, output-jack
 BuildRequires: libsamplerate-devel
 # input-sid
-%if %{with sidplay1}
-BuildRequires: libsidplay-devel
-%else
-BuildRequires: libsidplay2-devel
-%endif
+BuildRequires: libsidplayfp-devel
 # input-sndfile
 BuildRequires: libsndfile-devel >= 0.19
 # input-vorbis (>= 1.0), output-file
@@ -295,7 +293,6 @@ Summary(pl.UTF-8):  Wtyczka efektu crossfade dla odtwarzacza multimedialnego Auda
 License:       BSD
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
-Obsoletes:     audacious-output-crossfade
 Obsoletes:     bmp-output-crossfade
 
 %description -n audacious-effect-crossfade
@@ -582,6 +579,7 @@ License:    unknown
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
 Requires:      curl-libs >= 7.9.7
+Obsoletes:     bmp-general-audioscrobbler
 Obsoletes:     bmp-general-scrobbler
 
 %description -n audacious-general-scrobbler
@@ -733,6 +731,7 @@ License:    BSD
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
 Obsoletes:     bmp-input-mplayer
+Obsoletes:     bmp-input-mpc
 Obsoletes:     bmp-input-musepack
 
 %description -n audacious-input-ffaudio
@@ -1143,9 +1142,7 @@ EOF
 %{__autoheader}
 %configure \
        %{!?with_bs2b:--disable-bs2b} \
-       --enable-amidiplug \
-       --enable-ipv6 \
-       %{?with_sidplay1:--without-sidplay1}
+       --enable-amidiplug
 
 %{__make}