rpms/kaffeine/devel kaffeine.spec,1.21,1.22

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27726

Modified Files:
	kaffeine.spec 
Log Message:
* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-5
- s/nonfree/freeworld/
- --without-dvb (f11+)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kaffeine.spec	25 Feb 2009 10:07:50 -0000	1.21
+++ kaffeine.spec	6 Mar 2009 20:22:24 -0000	1.22
@@ -1,25 +1,28 @@
 
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_gstreamer --with-gstreamer
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+%define kdelibs3 kdelibs3
+BuildRequires: libxcb-devel
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
 %endif
 
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
+## define to build freeworld bits (for that other repo)
+#define freeworld 1
 
-## define to build nonfree bits (for that other repo)
-#define nonfree 1
+# FIXME 
+%if 0%{?fedora} > 10
+%define _without_dvb --without-dvb
+%endif
 
 Version: 0.8.7
 Release: 4%{?dist}
 
-%if 0%{?nonfree:1} == 0 
+%if 0%{?freeworld:1} == 0 
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %else
-Name:    kaffeine-extras-nonfree
+Name:    kaffeine-freeworld
 %endif
 
 License: GPLv2+
@@ -35,31 +38,25 @@
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: gettext
-# dvb
-BuildRequires: glibc-kernheaders
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-BuildRequires: kdelibs3-devel
-BuildRequires: libxcb-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: libvorbis-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 BuildRequires: xine-lib-devel
 
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
 Requires: kaffeine = %{version}
 %define _with_lame --with-lame
 %{?_with_lame:BuildRequires: lame-devel}
 %if 0%{?fedora} > 4
 # can view dvd's if libdvdcss is available
-Requires(hint): libdvdcss
-# extra/nonfree codec support
-Requires(hint): xine-lib-extras-nonfree
+#Requires(hint): libdvdcss
+# extra/freeworld codec support
+Requires(hint): xine-lib-extras-freeworld
 %endif
 
 %description
-Nonfree support bits for kaffeine, including DVD playback, MP3
+Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
 decoding, as well as extended audio/video codec support.
 
 %else
@@ -83,19 +80,17 @@
 Summary: Development files for %{name}
 Group:   Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs3-devel
+Requires: %{kdelibs3}-devel
 %description devel
 %{summary}.
 
-%if 0%{?libs}
 %package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
-%endif
 
 %endif
 
@@ -123,10 +118,11 @@
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --disable-final \
   --with-extra-includes=%{_includedir}/cdda \
-  %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
+  --with-gstreamer \
+  %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
 
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
 make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
 %else
 make %{?_smp_mflags}
@@ -136,7 +132,7 @@
 %install
 rm -rf %{buildroot}
 
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
 make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
 %else
 make install DESTDIR=%{buildroot}
@@ -171,7 +167,7 @@
 rm -rf %{buildroot}
 
 
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
 %files 
 %defattr(-,root,root,-)
 %{_libdir}/kde3/libkaffeinemp3lame.*
@@ -204,7 +200,7 @@
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
-%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
+%{_datadir}/apps/gstreamerpart/
 %{_datadir}/apps/kaffeine/
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/profiles/
@@ -228,6 +224,10 @@
 
 
 %changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild