rpms/kaffeine/F-8 kaffeine.spec,1.11,1.12

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Mar 7 15:17:57 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619

Modified Files:
	kaffeine.spec 
Log Message:
* Fri Mar 07 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-3
- fix deps wrt kaffeine-libs (#436442)
- f7: xcb support (#373411)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-8/kaffeine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kaffeine.spec	22 Feb 2008 18:05:11 -0000	1.11
+++ kaffeine.spec	7 Mar 2008 15:17:22 -0000	1.12
@@ -13,7 +13,7 @@
 #define nonfree 1
 
 Version: 0.8.6
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -34,7 +34,7 @@
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 7
+%if 0%{?fedora} > 6
 BuildRequires: libxcb-devel
 %endif
 # dvb
@@ -51,21 +51,21 @@
 Requires(hint): libdvdcss
 # extra/nonfree codec support
 Requires(hint): xine-lib-extras-nonfree
+%endif
+
+%description
+Nonfree support bits for kaffeine, including DVD playback, MP3
+decoding, as well as extended audio/video codec support.
+
 %else
+
 %if 0%{?libs}
 Requires: %{name}-libs = %{version}-%{release}
 %else
 Obsoletes: %{name}-libs < %{version}-%{release}
 Provides:  %{name}-libs = %{version}-%{release}
 %endif
-%endif
 
-
-%description
-Nonfree support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
-
-%else
 %description
 Kaffeine is a xine-based media player for KDE.  It plays back CDs,
 and VCDs, and can decode all (local or streamed) multimedia formats 
@@ -86,7 +86,6 @@
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: kdelibs3 >= %{version}
 # helps multilib upgrades
 Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
@@ -221,6 +220,13 @@
 
 
 %changelog
+* Fri Mar 07 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
 * Sun Jan 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-1
 - kaffeine-0.8.6
 




More information about the fedora-extras-commits mailing list