rpms/koffice/devel koffice.spec,1.66,1.67

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-12
- rebuild (for openexr-1.6.0)
- -libs: %post/%postun -p /sbin/ldconfig



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- koffice.spec	5 Sep 2007 17:35:50 -0000	1.66
+++ koffice.spec	15 Oct 2007 21:23:58 -0000	1.67
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -17,10 +17,10 @@
 Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
 
 # BuildRequires: world-devel ;)
-BuildRequires:  kdebase-devel
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdebase3-devel
+BuildRequires:  kdelibs3-devel
 # See http://bugzilla.redhat.com/244091
-%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.6) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 ## kjsembed bits, afaict, not really used (yet) -- Rex
 #BuildRequires:  kdebindings-devel
 BuildRequires:  freetype-devel
@@ -104,7 +104,7 @@
 Summary:        Runtime libraries for koffice
 Group:          System Environment/Libraries
 Conflicts:      koffice <= 4:%{version}-%{release}
-Requires:       kdelibs >= 6:%{kdelibs_ver}
+Requires:       kdelibs3 >= %{kdelibs_ver}
 %description libs
 %{summary}.
 
@@ -300,7 +300,6 @@
 
 
 %post core
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg ||:
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/locolor || :
@@ -310,7 +309,6 @@
 update-desktop-database >& /dev/null ||:
 
 %postun core
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg ||:
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/locolor || :
@@ -322,18 +320,9 @@
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
 
-%post kspread -p /sbin/ldconfig
-%postun kspread -p /sbin/ldconfig
-
 %post kpresenter -p /sbin/ldconfig
 %postun kpresenter -p /sbin/ldconfig
 
-%post karbon -p /sbin/ldconfig
-%postun karbon -p /sbin/ldconfig
-
-%post krita -p /sbin/ldconfig
-%postun krita -p /sbin/ldconfig
-
 %post kugar -p /sbin/ldconfig
 %postun kugar -p /sbin/ldconfig
 
@@ -343,17 +332,11 @@
 %post kchart -p /sbin/ldconfig
 %postun kchart -p /sbin/ldconfig
 
-%post kformula -p /sbin/ldconfig
-%postun kformula -p /sbin/ldconfig
-
-%post kivio -p /sbin/ldconfig
-%postun kivio -p /sbin/ldconfig
-
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
 
-%post kplato -p /sbin/ldconfig
-%postun kplato -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files suite
 #empty => virtual package
@@ -694,6 +677,11 @@
 
 
 %changelog
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-12
+- rebuild (for openexr-1.6.0)
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
 * Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.3-11
 - rebuild (for poppler)