rpms/kaffeine/devel kaffeine.spec,1.3,1.4

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kaffeine.spec 
Log Message:
* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
- disable gst08 support (for now), it's been orphaned



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kaffeine.spec	29 Nov 2006 18:14:55 -0000	1.3
+++ kaffeine.spec	18 Jan 2007 14:22:53 -0000	1.4
@@ -1,36 +1,39 @@
 
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 2
 %define _with_gstreamer --with-gstreamer
 %endif
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4
 %define gst 08 
-BuildRequires: libXtst-devel libXinerama-devel
+# gstreamer08 has been orphaned
+%undefine _with_gstreamer
+BuildRequires: libXinerama-devel libXtst-devel
 %endif
 
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 4%{?dist}
 
-%if "%{?nonfree:1}" == "1"
+%if "%{?nonfree:1}" != "1"
+# Fedora Review: http://bugzilla.redhat.com/213432
+Name:    kaffeine
+
+%else
 Name:    kaffeine-extras-nonfree
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-%else
-# Fedora Review: http://bugzilla.redhat.com/213432
-Name:    kaffeine
 %endif
 
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -54,7 +57,7 @@
 #endif
 
 %if "%{?nonfree:1}" == "1" 
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4
 # can view dvd's if libdvdcss is available
 Requires(hint): libdvdcss
 # extra/nonfree codec support
@@ -177,7 +180,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
@@ -191,15 +195,21 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
 %endif
 
 
 %changelog
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
 
 * Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3