rpms/koffice/EL-5 koffice-1.6.3-gcc43.patch, NONE, 1.1 koffice.spec, 1.53, 1.54

Rex Dieter rdieter at fedoraproject.org
Mon Oct 13 15:41:30 UTC 2008 

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13144

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-gcc43.patch 
Log Message:
branch sync


koffice-1.6.3-gcc43.patch:

--- NEW FILE koffice-1.6.3-gcc43.patch ---
# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/

Index: koffice/krita/core/kis_perspective_math.cpp
===================================================================
--- koffice/krita/core/kis_perspective_math.cpp	(revision 738928)
+++ koffice/krita/core/kis_perspective_math.cpp	(revision 738929)
@@ -24,7 +24,7 @@
 
 #if 1
 
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <math.h>
 //#define NDEBUG // uncomment to remove checking of assert()
@@ -57,9 +57,9 @@
         void  rprint()const;  //print entries on a single line
         void resize(int n);
         int operator==(const vector<ElType>& v)const;
-        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
-        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
-        friend ostream& operator<<(ostream& s,vector<ElType>& v);
+        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
+        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
+        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
 };
 template <class ElType>
         void vector<ElType>::zero()
@@ -129,10 +129,10 @@
         void  vector<ElType>::rprint()const  //print entries on a single line
 {
     int i;
-    cout << "VECTOR: ";
-    cout << "(";
-    for(i=0;i<len-1;i++) cout << data[i] << ",";
-    cout << data[len-1] << ")" << endl;
+    std::cout << "VECTOR: ";
+    std::cout << "(";
+    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
+    std::cout << data[len-1] << ")" << std::endl;
     return;
 }
 template <class ElType>
@@ -164,7 +164,7 @@
     return ans;
 }
 template <class ElType>
-        ostream& operator<<(ostream& s,vector<ElType>& v)
+        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
 {
     s << "(";
     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
@@ -192,7 +192,7 @@
         matrix<ElType> operator-(const matrix<ElType>& a);
         matrix<ElType> transpose();
     //matrix<ElType> inverse();
-        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
+        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
 };
@@ -357,7 +357,7 @@
     return ans;
 }
 template <class ElType>
-        ostream& operator<<(ostream& s,matrix<ElType>& m)
+        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
 {
     for(int i=0; i<m.rows;i++) s << m[i];
     return s;
@@ -381,7 +381,7 @@
 //         kdDebug() << "new search" << endl;
         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
 /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
-            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
+            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
             vv[i]=1.0/big;
     }
     for (j=0;j<n;j++)
Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
===================================================================
--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729275)
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729276)
@@ -174,12 +174,7 @@
 	return m_cell->text();
 }
 
-bool Cell::setText(const QString& text, bool asString) {
-
-	//FIXME: there is some problem with asString parameter, when it's set
-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
-
+bool Cell::setText(const QString& text) {
 	KSpread::ProtectedCheck prot;
 	prot.setSheet (m_sheet);
 	prot.add (QPoint (m_col, m_row));
@@ -189,7 +184,7 @@
 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
 	dm->setSheet (m_sheet);
 	dm->setValue (text);
-	dm->setParsing (!asString);
+	dm->setParsing (true);
 	dm->add (QPoint (m_col, m_row));
 	dm->execute ();
 
Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
===================================================================
--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729275)
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729276)
@@ -131,11 +131,10 @@
 		*/
 		const QString text() const;
 		/**
-		* Set the text of the cell. If asString is true, the text
-		* will be handled as string else we try to parse the
-		* string to the expected value.
+		* Set the text of the cell. the text
+		* will be handled as string
 		*/
-		bool setText(const QString& text, bool asString = false);
+		bool setText(const QString& text);
 
 		/**
 		* Return the textcolor as RGB-value in the format "#RRGGBB".


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/EL-5/koffice.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- koffice.spec	9 Nov 2007 14:27:00 -0000	1.53
+++ koffice.spec	13 Oct 2008 15:41:00 -0000	1.54
@@ -1,11 +1,18 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 Name:           koffice
+Epoch:          1
 Version:        1.6.3
-Release:        13%{?dist}
-Summary:        A free, integrated office suite for KDE
+Release:        16%{?dist}
+Summary:        An integrated office suite
 
 Group:          Applications/Productivity
-# apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
@@ -19,11 +26,15 @@
 # http://www.kde.org/info/security/advisory-20071107-1.txt
 Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 
+# upstream patch pulled via: svn diff -c 738929 
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+Patch3: koffice-1.6.3-gcc43.patch
+
 # BuildRequires: world-devel ;)
-BuildRequires:  kdebase-devel
-BuildRequires:  kdelibs-devel
+BuildRequires:  %{kdelibs3}-devel
 # See http://bugzilla.redhat.com/244091
-%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.7) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs3_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
@@ -65,176 +76,160 @@
 %endif
 
 %description
-KOffice - Integrated Office Suite
-KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
+KOffice is an integrated office suite.
 
 %package suite
-Summary:        A free, integrated office suite for KDE
+Summary:        An integrated office suite
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       koffice-core = %{version}-%{release} 
-Requires:       koffice-kword = %{version}-%{release} 
-Requires:       koffice-kspread = %{version}-%{release} 
-Requires:       koffice-kpresenter = %{version}-%{release}
-Requires:       koffice-kivio = %{version}-%{release}
-Requires:       koffice-karbon = %{version}-%{release}
-Requires:       koffice-krita = %{version}-%{release}
-Requires:       koffice-kugar = %{version}-%{release}
-Requires:       koffice-kexi = %{version}-%{release}
-Requires:       koffice-kexi-driver-mysql = %{version}-%{release}
-Requires:       koffice-kexi-driver-pgsql = %{version}-%{release}
-Requires:       koffice-kchart = %{version}-%{release}
-Requires:       koffice-kformula = %{version}-%{release}
-Requires:       koffice-filters = %{version}-%{release}
-Requires:       koffice-kplato = %{version}-%{release}
+Requires:       koffice-core = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kword = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kspread = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kpresenter = %{epoch}:%{version}-%{release}
+Requires:       koffice-kivio = %{epoch}:%{version}-%{release}
+Requires:       koffice-karbon = %{epoch}:%{version}-%{release}
+Requires:       koffice-krita = %{epoch}:%{version}-%{release}
+Requires:       koffice-kugar = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kchart = %{epoch}:%{version}-%{release}
+Requires:       koffice-kformula = %{epoch}:%{version}-%{release}
+Requires:       koffice-filters = %{epoch}:%{version}-%{release}
+Requires:       koffice-kplato = %{epoch}:%{version}-%{release}
 
 %description suite
-KOffice - Integrated Office Suite
-KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
+KOffice is an integrated office suite.
 
 %package core
-Summary:        Core support files for koffice
+Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires:       perl
 Conflicts:      koffice-i18n < 4:%{version}
-
 %description core
 %{summary}.
 
 %package libs
-Summary:        Runtime libraries for koffice
+Summary:        Runtime libraries for %{name} 
 Group:          System Environment/Libraries
 Conflicts:      koffice <= 4:%{version}-%{release}
-Requires:       kdelibs >= 6:%{kdelibs_ver}
+Requires:       %{kdelibs3} >= %{kdelibs3_ver}
+License:        LGPLv2+
 %description libs
 %{summary}.
 
 %package devel
-Summary:        Libraries needed for koffice development
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
+License:        LGPLv2+
 %description devel
-%{summary}
+%{summary}.
 
 %package kword
-Summary:A frame-based word processor capable of professional standard documents
+Summary:	A frame-based word processor capable of professional standard documents
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kword
-%{summary}
+%{summary}.
 
 %package kspread
 Summary:        A powerful spreadsheet application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kspread
-%{summary}
+%{summary}.
 
 %package kpresenter
 Summary:        A full-featured presentation program
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kpresenter
-%{summary}
+%{summary}.
 
 %package kivio
 Summary:        A flowcharting application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Requires:       kdegraphics
-Obsoletes:      kivio
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes:      kivio < %{version}-%{release}
 %description kivio
-%{summary}
+%{summary}.
 
 %package karbon
 Summary:        A vector drawing application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description karbon
-%{summary}
+%{summary}.
 
 %package krita
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Requires:	%{name}-filters
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description krita
-%{summary}
+%{summary}.
 
 %package kugar
 Summary:        A tool for generating business quality reports
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kugar
-%{summary}
+%{summary}.
 
 %package kexi
 Summary:        An integrated environment for managing data
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kexi
-%{summary}
+%{summary}.
 For additional database drivers take a look at %{name}-kexi-driver-*
 
 %package kexi-driver-mysql
-Summary:        mysql-driver for kexi
+Summary:        Mysql-driver for kexi
 Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-
+Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 %description kexi-driver-mysql
-%{summary}
+%{summary}.
 
 %package kexi-driver-pgsql
-Summary:        pgsql-driver for kexi
+Summary:        Postresql driver for kexi
 Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-
+Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 %description kexi-driver-pgsql
-%{summary}
+%{summary}.
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kchart
-%{summary}
+%{summary}.
 
 %package kformula
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Requires:       mathml-fonts
-
 %description kformula
-%{summary}
+%{summary}.
 
 %package filters
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description filters
-%{summary}
+%{summary}.
 
 %package kplato
 Summary:         An integrated project management and planning tool
 Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-
+Requires:        %{name}-core = %{epoch}:%{version}-%{release}
 %description kplato
-%{summary}
+%{summary}.
 
 
 %prep
@@ -242,6 +237,7 @@
 
 %patch1 -p0 -b .CVE-2007-3387
 %patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
 
 
 %build
@@ -261,14 +257,14 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-[ ! -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
-install -p -D -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/koshell.png
+[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
 
 # Replace absolute symlinks with relative ones
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+pushd %{buildroot}%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
@@ -281,60 +277,94 @@
 popd
 
 desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
   --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
+  %{buildroot}%{_datadir}/applnk/Office/*.desktop
 
 ## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
 ## until http://bugzilla.redhat.com/245190 is fixed
-for desktop_file in $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/*.desktop ; do
+for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
   grep "^NoDisplay=" ${desktop_file} || \
     echo "NoDisplay=True" >> ${desktop_file}
 done
 
-## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+## unpackaged files
+rm -f %{buildroot}%{_libdir}/lib*.la
 # shouldn't these be in koffice-l10n? 
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{_libdir}/lib*common.so
+rm -f %{buildroot}%{_libdir}/lib*filters.so
+rm -f %{buildroot}%{_libdir}/lib*private.so
+rm -f %{buildroot}%{_libdir}/libkarbon*.so
+rm -f %{buildroot}%{_libdir}/libkchart*.so
+rm -f %{buildroot}%{_libdir}/libkexi*.so
+rm -f %{buildroot}%{_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_libdir}/libkplato*.so
+rm -f %{buildroot}%{_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{_libdir}/libkword*.so
+rm -f %{buildroot}%{_libdir}/libkrita*.so
+rm -f %{buildroot}%{_libdir}/libkross*.so
+rm -f %{buildroot}%{_libdir}/libkugar*.so
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post core
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/locolor || :
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun core
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/locolor || :
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%post kword -p /sbin/ldconfig
-%postun kword -p /sbin/ldconfig
-
-%post kpresenter -p /sbin/ldconfig
-%postun kpresenter -p /sbin/ldconfig
-
-%post kugar -p /sbin/ldconfig
-%postun kugar -p /sbin/ldconfig
-
-%post kexi -p /sbin/ldconfig
-%postun kexi -p /sbin/ldconfig
-
-%post kchart -p /sbin/ldconfig
-%postun kchart -p /sbin/ldconfig
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%post kword
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kword
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%post kpresenter
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kpresenter 
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%post kugar
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kugar
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%post kexi
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kexi
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%post kchart
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kchart
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -347,7 +377,7 @@
 
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB README
+%doc AUTHORS COPYING README
 %{_bindir}/koshell
 %{_bindir}/kthesaurus
 %{_bindir}/koconverter
@@ -404,6 +434,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%doc COPYING.LIB
 #_libdir/libk*common.so.*
 %{_libdir}/libkarboncommon.so.*
 %{_libdir}/libkiviocommon.so.*
@@ -426,21 +457,22 @@
 
 %files devel
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs/
+# FIXME: include only shlib symlinks we know/want to export
 %{_libdir}/lib*.so
-%exclude %{_libdir}/libkudesignercore.so
 %exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkudesignercore.so
 
 %files kword
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kword/
 %{_bindir}/kword
 %{_libdir}/libkdeinit_kword.so
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
 %{_datadir}/apps/kword/
-%{_datadir}/doc/HTML/en/kword/
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
@@ -449,9 +481,9 @@
 
 %files kspread
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kspread/
 %{_bindir}/kspread
 %{_libdir}/libkdeinit_kspread.so
-#{_libdir}/libkspreadcommon.so.*
 %{_libdir}/kde3/kspread.*
 %{_libdir}/kde3/libkspreadpart.*
 %{_libdir}/kde3/kwmailmerge_kspread.*
@@ -467,7 +499,6 @@
 %{_libdir}/kde3/kspreadscripting.*
 %{_libdir}/kde3/krosskspreadcore.*
 %{_datadir}/apps/kspread/
-%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
@@ -475,6 +506,7 @@
 
 %files kpresenter
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kpresenter/
 %{_bindir}/kpresenter
 %{_bindir}/kprconverter.pl
 %{_libdir}/libkdeinit_kpresenter.so
@@ -482,7 +514,6 @@
 %{_libdir}/libkpresenterprivate.so.*
 %{_libdir}/kde3/*kpresenter*.*
 %{_datadir}/apps/kpresenter/
-%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
@@ -490,9 +521,9 @@
 
 %files karbon
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/karbon/
 %{_bindir}/karbon
 %{_libdir}/libkdeinit_karbon.so
-#{_libdir}/libkarboncommon.so.*
 %{_libdir}/kde3/*karbon*.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
@@ -502,10 +533,10 @@
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
 %{_datadir}/applications/kde/*karbon.desktop
-%{_datadir}/doc/HTML/en/karbon/
 
 %files krita
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/krita/
 %{_bindir}/krita
 %{_libdir}/libkdeinit_krita.so
 %{_libdir}/libkrita*.so.*
@@ -516,10 +547,10 @@
 %{_datadir}/applications/kde/*krita*.desktop
 %{_datadir}/applnk/.hidden/*krita*.desktop
 %{_datadir}/apps/kritaplugins/
-%{_datadir}/doc/HTML/en/krita/
 
 %files kugar
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kugar/
 %{_bindir}/kugar
 %{_bindir}/kudesigner
 %{_libdir}/libkdeinit_kugar.so
@@ -532,13 +563,13 @@
 %{_libdir}/kde3/libkugarpart.*
 %{_datadir}/apps/kudesigner/
 %{_datadir}/apps/kugar/
-%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/kde/*kugar.desktop
 %{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kexi/
 %{_bindir}/kexi*
 %{_bindir}/ksqlite*
 %{_bindir}/krossrunner
@@ -552,18 +583,17 @@
 %{_libdir}/kde3/kexi.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{_libdir}/kde3/libkspreadkexiimport.*
 %{_datadir}/config/kexirc
 %{_datadir}/config/magic/kexi.magic
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
-%{_datadir}/services/kexi
+%{_datadir}/services/kexi/
 %{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi/
 %{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
-# shouldn't this be in koffice-l10n?
-#%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kexi*
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
@@ -581,35 +611,34 @@
 
 %files kchart
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kchart/
 %{_bindir}/kchart
 %{_libdir}/libkchart*.so.*
 %{_libdir}/libkdeinit_kchart.so
 %{_libdir}/kde3/*kchart*.*
 %{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart/
 %{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kformula/
 %{_bindir}/kformula
 %{_libdir}/libkdeinit_kformula.so
 %{_libdir}/kde3/*kformula*.*
 %{_datadir}/apps/kformula/
-%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
 %{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kivio/
 %{_bindir}/kivio
 %{_libdir}/libkdeinit_kivio.so
-#{_libdir}/libkiviocommon.so.*
 %{_libdir}/kde3/*kivio*.*
 %{_libdir}/kde3/straight_connector.*
 %{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
 %{_datadir}/applications/kde/*kivio.desktop
 
@@ -660,7 +689,6 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libkspreadkexiimport.*
 %{_libdir}/kde3/libolefilter.*
 %{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
@@ -670,28 +698,39 @@
 
 %files kplato
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kplato/
 %{_bindir}/kplato
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
 %{_datadir}/apps/kplato/
-%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
 %{_datadir}/applications/kde/*kplato.desktop
 
 
-%changelog
-* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 
-1.6.3-13
+%changelog 
+* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
+- revert koffice2->koffice1, introduce Epoch
+- fix pkg interdependencies (#394101), multilib issues
+- -krita: drop Requires: %%name-filters (#394101)
+- cleanup scriptlets
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
+- upstream gcc43 patch (#433994)
+- kivio: omit Requires: kdegraphics, use versioned Obsoletes
+- touchup %%descriptions, %%summaries
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.3-14
+- Autorebuild for GCC 4.3
+
+* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.3-13
 - CVE-2007-4352 CVE-2007-5392 CVE-2007-5393 (#372611)
 
-* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.3-12
+* 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
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.3-11
 - rebuild (for poppler) 
 - re-enable (kross)ruby support (f8+)

More information about the fedora-extras-commits mailing list