rpms/koffice/FC-6 koffice.spec,1.45,1.46

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/koffice/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30820

Modified Files:
	koffice.spec 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net>
1.6.2-4
- -devel: +%%defattr
- -libs: (new) subpkg, multilib issues
- BR: +libpaper-devel -graphviz-devel

* Sun Dec 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
1.6.2-3
- -devel %%files: +%%exclude %%_libdir/libkdeinit_*.so

* Sat Dec 09 2006 Rex Dieter <rexdieter[AT]users.sf.net>
1.6.2-2
- BR: poppler-qt-devel (#158941,#212145)



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- koffice.spec	1 Dec 2006 22:07:48 -0000	1.45
+++ koffice.spec	15 Dec 2006 13:36:39 -0000	1.46
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.1
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -15,15 +15,17 @@
 # BuildRequires: world-devel ;)
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
+## kjsembed bits, afaict, not really used (yet) -- Rex
+#BuildRequires:  kdebindings-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 3
 BuildRequires:  GraphicsMagick-devel
-# ImageMagick usage is deprecated (in favor of GraphicsMagick), 
-# and can likely go way, but let's keep it around, for now.  -- Rex
+%endif
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -39,7 +41,6 @@
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
-BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
@@ -50,8 +51,9 @@
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
-BuildRequires:  poppler-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  poppler-qt-devel
+BuildRequires:  libpaper-devel
 %endif
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:  libXi-devel
@@ -86,21 +88,27 @@
 KOffice - Integrated Office Suite
 KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
 
-
 %package core
-Summary:        Core packages for koffice
+Summary:        Core support files for koffice
 Group:          Applications/Productivity
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:       perl
-Conflicts:      koffice <= 4:%{version}-%{release}
 Conflicts:      koffice-i18n < 4:%{version}
 
 %description core
-core libraries and support files for koffice
+%{summary}.
+
+%package libs
+Summary:        Runtime libraries for koffice
+Group:          System Environment/Libraries
+Conflicts:      koffice <= 4:%{version}-%{release}
+%description libs
+%{summary}.
 
 %package devel
 Summary:        Libraries needed for koffice development
-Group:          System Environment/Libraries
-Requires:       %{name}-core = %{version}-%{release}
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description devel
 %{summary}
@@ -344,21 +352,6 @@
 %{_bindir}/koconverter
 %{_libdir}/libkdeinit_koshell.so
 %{_libdir}/libkdeinit_kthesaurus.so
-%{_libdir}/libkdchart.so.*
-%{_libdir}/libkochart.so.*
-%{_libdir}/libkofficecore.so.*
-%{_libdir}/libkofficeui.so.*
-%{_libdir}/libkotext.so.*
-%{_libdir}/libkowmf.so.*
-%{_libdir}/libkopainter.so.*
-%{_libdir}/libkstore.so.*
-%{_libdir}/libkwmailmerge_interface.so.*
-%{_libdir}/libkwmf.so.*
-%{_libdir}/libkformulalib.so.*
-%{_libdir}/libkopalette.so.*
-%{_libdir}/libkoproperty.so.*
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
 %{_libdir}/kde3/kfile_koffice.*
 %{_libdir}/kde3/kfile_ooo.*
 %{_libdir}/kde3/kfile_abiword.*
@@ -407,10 +400,31 @@
 %{_libdir}/kde3/krosspython.*
 %{?ruby:%{_libdir}/kde3/krossruby.*}
 
+%files libs
+%defattr(-,root,root,-)
+#_libdir/lib*.so.*
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
+
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_datadir}/doc/HTML/en/koffice-apidocs/
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -659,6 +673,20 @@
 
 
 %changelog
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+1.6.2-4
+- -devel: +%%defattr
+- -libs: (new) subpkg, multilib issues
+- BR: +libpaper-devel -graphviz-devel
+
+* Sun Dec 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+1.6.2-3
+- -devel %%files: +%%exclude %%_libdir/libkdeinit_*.so
+
+* Sat Dec 09 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+1.6.2-2
+- BR: poppler-qt-devel (#158941,#212145)
+
 * Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 1.6.1-1
 - koffice-1.6.1 (#218030)