rpms/kdegraphics/F-8 kdegraphics.spec,1.110,1.111

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdegraphics.spec 
Log Message:
* Tue Oct 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
- -libs: exclude libkpovmodeler
- -libs conditional (f8+)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/kdegraphics.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdegraphics.spec	15 Oct 2007 21:16:25 -0000	1.110
+++ kdegraphics.spec	25 Oct 2007 03:07:22 -0000	1.111
@@ -3,11 +3,16 @@
 %define final 1
 %define make_cvs 0
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -22,7 +27,13 @@
 Provides: kdegraphics3 = %{version}-%{release}
 
 Requires: ghostscript
+
+%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
 
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel >= %{version}
@@ -102,6 +113,7 @@
 * kfaxview
 * kpovmodler
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
@@ -110,7 +122,7 @@
 #Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-
+%endif
 
 
 %prep
@@ -188,12 +200,17 @@
   done
 done
 
+# unpackaged files
+# omit kpovmodeler-devel files (for now) -- Rex
+rm -f %{buildroot}/libkpovmodeler.so
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
@@ -201,15 +218,19 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; 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
+
 
 %if 0%{!?rhel:1}
 %post extras
@@ -256,7 +277,8 @@
 %doc rpmdocs/kpovmodeler/
 %doc %{_docdir}/HTML/en/kpovmodeler/
 %{_bindir}/kpovmodeler
-%{_libdir}/libkpovmodeler.*
+%{_libdir}/libkpovmodeler.so.*
+%{_libdir}/libkpovmodeler.la
 %{_libdir}/kde3/libkpovmodelerpart.*
 %{_datadir}/applications/kde/kpovmodeler.desktop
 %{_datadir}/apps/kpovmodeler/
@@ -310,21 +332,30 @@
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/kde3/*
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-
+%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
 %exclude %{_libdir}/libkfaximage.la
 %exclude %{_libdir}/libkpovmodeler.la
+%exclude %{_libdir}/libkpovmodeler.so.*
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/kde/*
+%{_libdir}/lib*.so
+#exclude %{_libdir}/libkpovmodeler.so
+%exclude %{_libdir}/libkfaximage.so
+%exclude %{_libdir}/libkdeinit_*.so
+
 
 %changelog
+* Tue Oct 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
+- -libs: exclude libkpovmodeler
+- -libs conditional (f8+)
+
 * Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-2
 - respin (for openexr-1.6.0)
 - -libs: %%post/%%postun -p /sbin/ldconfig