rpms/kaffeine/devel kaffeine.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kaffeine.spec 
Log Message:
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
- multiarch conflicts in kaffeine (#341681)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kaffeine.spec	19 Sep 2007 20:16:29 -0000	1.9
+++ kaffeine.spec	30 Oct 2007 13:41:15 -0000	1.10
@@ -4,11 +4,16 @@
 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.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -46,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.
@@ -64,12 +77,27 @@
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs-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}
@@ -79,6 +107,9 @@
 # fix perms on docs
 chmod -x AUTHORS ChangeLog INSTALL TODO ||:
 
+# avoid autofoo rerun in 0.8.5
+touch -r acinclude.m4 admin/acinclude.m4.in
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -87,8 +118,6 @@
 #  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
-touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
-
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
@@ -150,23 +179,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
@@ -178,6 +212,13 @@
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kaffeine/
@@ -187,7 +228,10 @@
 
 
 %changelog
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+* 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