rpms/kdevelop/devel kdevelop.spec,1.63,1.64

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdevelop.spec 
Log Message:
-libs conditional (f8+)



Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdevelop.spec	30 Oct 2007 14:59:27 -0000	1.63
+++ kdevelop.spec	1 Nov 2007 17:47:19 -0000	1.64
@@ -7,6 +7,11 @@
 
 %define make_cvs 1
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
@@ -29,7 +34,16 @@
 Patch500: kdevelop-3.5.0-autosave.patch
 
 Provides: kdevelop3 = %{version}-%{release}
+
+%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}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
 
 Requires: kdelibs3-devel >= %{kde_version}
 Requires: make
@@ -93,6 +107,7 @@
 %description devel
 %{summary}.
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
@@ -103,6 +118,7 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
+%endif
 
 
 
@@ -163,6 +179,7 @@
 
 
 %post
+%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -170,15 +187,18 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+%{!?libs:/sbin/ldconfig}
 for f in 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
@@ -202,8 +222,10 @@
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
+%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -216,6 +238,7 @@
 %changelog
 * Tue Oct 31 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-4
 - %%post/%%postun libs -p /sbin/ldconfig
+- -libs conditional (f8+)
 
 * Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-3
 - -devel, -libs subpkgs, multiarch conflicts (#341791)