rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5863

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-6
- -extras: --with-musicbrainz (using libtunepimp-0.4.x, we'll deal with
  the hairball that is libtunepimp-0.5 later)



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdemultimedia-extras.spec	29 Aug 2006 18:26:07 -0000	1.9
+++ kdemultimedia-extras.spec	29 Aug 2006 18:51:11 -0000	1.10
@@ -22,7 +22,6 @@
 BuildConflicts: akode-extras
 # debugging: to make sure no extras bits (accidentally) get excluded
 %{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}}
-# disabled until fixed to work w/libtunepimp-0.5.x
 %define _with_musicbrainz --with-musicbrainz
 %define _with_libsamplerate --with-libsamplerate
 %define _with_taglib --with-taglib
@@ -37,18 +36,15 @@
 %endif
 
 # distro/release bits
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _with_gstreamer --with-gstreamer
-%endif
-%if "%{?fedora}" > "4"
+#endif
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define gst gstreamer08
 BuildRequires: libXxf86vm-devel
 # likely only required for nonfree -- Rex
 BuildRequires: libXxf86dga-devel
 %endif
-%if "%{?rhel}" > "3"
-%define _with_gstreamer --with-gstreamer
-%endif
 
 %define is_release 2
 
@@ -70,7 +66,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -98,7 +94,7 @@
 BuildRequires: libvorbis-devel >= 1:1.1.0
 %{?core:Requires: libvorbis >= 1:1.1.0}
 %{?_with_taglib:BuildRequires: taglib-devel}
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel >= 0.5.0}
+%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel}
 %{?_with_akode:BuildRequires: akode-devel}
 # gstreamer(08) pkg_name
 %{?_with_gstreamer:BuildRequires: %{?gst}%{!?gst:gstreamer}-plugins-devel}
@@ -451,8 +447,12 @@
 
 
 %changelog
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-6
+- -extras: --with-musicbrainz (using libtunepimp-0.4.x, we'll deal with
+  the hairball that is libtunepimp-0.5 later)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-5
-- fc6 respin
+- -extras: drop --with-musicbrainz (until juk is fixed for libtunepimp-0.5) 
 
 * Thu Aug 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-4
 - strip ogg/vorbis, audiofile from .la files (#178734)