SPECS (DEVEL): amarok.spec - blah, don't hash (doesn't work anyway...

[glen]

Author: glen                         Date: Thu May 18 22:17:26 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- blah, don't hash (doesn't work anyway), just reverse the bcond

---- Files affected:
SPECS:
   amarok.spec (1.106.2.22 -> 1.106.2.23) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.106.2.22 SPECS/amarok.spec:1.106.2.23
--- SPECS/amarok.spec:1.106.2.22	Thu May 18 23:41:36 2006
+++ SPECS/amarok.spec	Fri May 19 00:17:21 2006
@@ -6,7 +6,7 @@
 #	* track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
 #
 # Conditional builds:
-#%bcond_without	gstreamer	# disable gstreamer
+%bcond_with	gstreamer	# enable gstreamer (gst10 not stable)
 %bcond_without	mas		# disable MAS audio backend
 %bcond_without	xine		# disable xine engine
 %bcond_without	xmms 		# disable xmms wrapping
@@ -41,7 +41,7 @@
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gettext-devel
-#%{?with_gstreamer:BuildRequires:	gstreamer-devel >= 0.10.0}
+%{?with_gstreamer:BuildRequires:	gstreamer-devel >= 0.10.0}
 BuildRequires:	gtk+2-devel
 BuildRequires:	kdebase-devel
 %{?with_akode:BuildRequires:	kdemultimedia-akode}
@@ -102,10 +102,10 @@
 Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
 
 
-#%package gstreamer
-#Summary:	Plugin gstreamer
-#Summary(pl):	Wtyczka gstreamer
-#Group:		X11/Applications/Multimedia
+%package gstreamer
+Summary:	Plugin gstreamer
+Summary(pl):	Wtyczka gstreamer
+Group:		X11/Applications/Multimedia
 # deps, to get it working:
 # mp3 decoder:	gstreamer-mad
 # ogg decoder:	gstreamer-vorbis
@@ -116,19 +116,19 @@
 #  probably /usr/lib/gstreamer-0.8/libgstadder.so
 #  and probably /usr/lib/gstreamer-0.8/libgstvolume.so
 # gstreamer-musicbrainz for being able to edit id3 tags on files.
-#Requires:	%{name} = %{version}-%{release}
-#Requires:	gstreamer-audio-effects
-#Requires:	gstreamer-audiosink
-#Requires:	gstreamer-mad
-#Requires:	gstreamer-musicbrainz
-#Requires:	gstreamer-vorbis
-#Provides:	%{name}-plugin = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
+Requires:	gstreamer-audio-effects
+Requires:	gstreamer-audiosink
+Requires:	gstreamer-mad
+Requires:	gstreamer-musicbrainz
+Requires:	gstreamer-vorbis
+Provides:	%{name}-plugin = %{version}-%{release}
 
-#%description gstreamer
-#Plugin gstreamer.
+%description gstreamer
+Plugin gstreamer.
 
-#%description gstreamer -l pl
-#Wtyczka gstreamer.
+%description gstreamer -l pl
+Wtyczka gstreamer.
 
 %package xine
 Summary:	Plugin xine
@@ -220,7 +220,7 @@
 	--disable-rpath \
 	--with%{!?with_mas:out}-mas \
 	--with%{!?with_xine:out}-xine \
-#	--with%{!?with_gstreamer:out}-gstreamer10 \
+	--with%{!?with_gstreamer:out}-gstreamer10 \
 	--with%{!?with_akode:out}-akode \
 	--with%{!?with_helix:out}-helix%{?with_helix:=usegivenpath} \
 	--with%{!?with_nmm:out}-nmm \
@@ -312,14 +312,14 @@
 %{_datadir}/services/amarok_aKode-engine.desktop
 %endif
 
-#%if %{with gstreamer}
-#%files gstreamer
-#%defattr(644,root,root,755)
-#%{_libdir}/kde3/libamarok_gst10engine_plugin.la
-#%attr(755,root,root) %{_libdir}/kde3/libamarok_gst10engine_plugin.so
-#%{_datadir}/config.kcfg/gstconfig.kcfg
-#%{_datadir}/services/amarok_gst10engine_plugin.desktop
-#%endif
+%if %{with gstreamer}
+%files gstreamer
+%defattr(644,root,root,755)
+%{_libdir}/kde3/libamarok_gst10engine_plugin.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_gst10engine_plugin.so
+%{_datadir}/config.kcfg/gstconfig.kcfg
+%{_datadir}/services/amarok_gst10engine_plugin.desktop
+%endif
 
 %if %{with helix}
 %files helix
@@ -431,6 +431,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106.2.23  2006/05/18 22:17:21  glen
+- blah, don't hash (doesn't work anyway), just reverse the bcond
+
 Revision 1.106.2.22  2006/05/18 21:41:36  shadzik
 - gstreamer10 engine still not stable in this realese, so hashed out
 - vfat-mediadevice -> generic-mediadevice
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.106.2.22&r2=1.106.2.23&f=u