rpms/kdewebdev/F-8 kdewebdev.spec,1.39,1.40

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdewebdev.spec 
Log Message:
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
- -libs: Obsoletes: %name ... to help out multilib upgrades
- -libs conditional (f8+)



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/kdewebdev.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdewebdev.spec	16 Oct 2007 14:02:47 -0000	1.39
+++ kdewebdev.spec	25 Oct 2007 20:21:56 -0000	1.40
@@ -1,11 +1,16 @@
 
 %define make_cvs 1
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -24,14 +29,19 @@
 
 %if %{make_cvs}
 BuildRequires: automake libtool
-%endif
-BuildRequires: desktop-file-utils
+%endif BuildRequires: desktop-file-utils
 BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: kdesdk3-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: perl
 
+%if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 # optional
@@ -66,15 +76,18 @@
 %description devel
 %{summary}.
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 #Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-
+%endif
 
 
 %prep
@@ -129,7 +142,6 @@
 done
 popd
 
-
 # rpmdocs
 for dir in k* quanta; do
   for file in AUTHORS ChangeLog README TODO ; do
@@ -138,8 +150,8 @@
 done
 
 
-
 %post
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -147,15 +159,18 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
+%endif
 
 
 %clean
@@ -181,20 +196,26 @@
 %{_datadir}/servicetypes/*
 %{_docdir}/HTML/en/*
 
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/kde/*
-
+%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/kde/*
+
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -libs conditional (f8+)
+
 * Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
-- -libs subpkg (more multilib friendly)
+- -libs subpkg (more multilib friendly
 - kommander_ver 1.2.2
 
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-1