rpms/kaffeine/F-7 .cvsignore, 1.4, 1.5 kaffeine.spec, 1.5, 1.6 sources, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Jan 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-1
- kaffeine-0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2007 00:21:07 -0000	1.4
+++ .cvsignore	22 Feb 2008 18:07:54 -0000	1.5
@@ -1,3 +1 @@
-kaffeine-0.8.2.tar.bz2
-kaffeine-0.8.3.tar.bz2
-kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.6.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-7/kaffeine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kaffeine.spec	22 Jun 2007 00:21:07 -0000	1.5
+++ kaffeine.spec	22 Feb 2008 18:07:55 -0000	1.6
@@ -4,10 +4,15 @@
 BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 %endif
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.4
+Version: 0.8.6
 Release: 1%{?dist}
 
 %if "%{?nonfree:1}" != "1"
@@ -17,19 +22,21 @@
 Name:    kaffeine-extras-nonfree
 %endif
 
-License: GPL
+License: GPLv2+
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs3-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-#BuildRequires: libxcb-devel
+%if 0%{?fedora} > 7
+BuildRequires: libxcb-devel
+%endif
 # dvb
 BuildRequires: glibc-kernheaders 
 %{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
@@ -44,8 +51,16 @@
 Requires(hint): libdvdcss
 # extra/nonfree codec support
 Requires(hint): xine-lib-extras-nonfree
+%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.
@@ -62,21 +77,33 @@
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel
+Requires: %{name}-libs = %{version}-%{release}
+Requires: kdelibs3-devel
 %description devel
 %{summary}.
+
+%if 0%{?libs}
+%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
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
 %endif
 
+%endif
+
+
 
 %prep
 %setup -q -n kaffeine-%{version}
 
 %{?nonfree:%patch1 -p1 -b .codecs}
 
-# fix perms on docs
-chmod -x AUTHORS ChangeLog INSTALL TODO ||:
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -146,23 +173,28 @@
 %else
 
 %post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
-%{_libdir}/libkaffeineaudioencoder.so.*
-%{_libdir}/libkaffeinedvbplugin.so.*
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
@@ -174,17 +206,49 @@
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kaffeine/
-%{_libdir}/libkaffeineaudioencoder.so
-%{_libdir}/libkaffeinedvbplugin.so
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Sun Jan 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
 * Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4
+- kaffeine-0.8.4 (#243823)
 
 * Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
 - disable gst08 support (for now), it's been orphaned


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2007 00:21:07 -0000	1.4
+++ sources	22 Feb 2008 18:07:55 -0000	1.5
@@ -1 +1 @@
-6f62ebb7a6f88ff49f452856a1660d95  kaffeine-0.8.4.tar.bz2
+102cced6a686f5ffffee94652ca2a093  kaffeine-0.8.6.tar.bz2