SPECS: koffice.spec - add kde-common-PLD.patch

[glen]

Author: glen                         Date: Wed Oct 25 18:18:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add kde-common-PLD.patch

---- Files affected:
SPECS:
   koffice.spec (1.161 -> 1.162) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.161 SPECS/koffice.spec:1.162
--- SPECS/koffice.spec:1.161	Wed Oct 25 18:57:01 2006
+++ SPECS/koffice.spec	Wed Oct 25 20:18:29 2006
@@ -33,10 +33,10 @@
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/koffice-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	e669cf19b2e1c7db7029c0772c527c0d
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/koffice-1.6-rc1/src/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-python25-64bit.patch
-Patch2:		kde-ac260-lt.patch
+Patch0:		kde-common-PLD.patch
+Patch1:		%{name}-build.patch
+Patch2:		%{name}-python25-64bit.patch
+Patch3:		kde-ac260-lt.patch
 URL:		http://www.koffice.org/
 BuildRequires:	ImageMagick-c++-devel >= 1:6.2.4.0
 BuildRequires:	OpenEXR-devel
@@ -318,10 +318,10 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description kross-python
-Kross is a scripting bridge to embed scripting functionality
-into an application. Kross provides an abstract API to access
-the scripting functionality in a interpreter-independend
-way. This package provides Python scripting backend.
+Kross is a scripting bridge to embed scripting functionality into an
+application. Kross provides an abstract API to access the scripting
+functionality in a interpreter-independend way. This package provides
+Python scripting backend.
 
 %package kross-ruby
 Summary:	KOffice - Kross Ruby
@@ -329,10 +329,10 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description kross-ruby
-Kross is a scripting bridge to embed scripting functionality
-into an application. Kross provides an abstract API to access
-the scripting functionality in a interpreter-independend
-way. This package provides Ruby scripting backend.
+Kross is a scripting bridge to embed scripting functionality into an
+application. Kross provides an abstract API to access the scripting
+functionality in a interpreter-independend way. This package provides
+Ruby scripting backend.
 
 %package kspread
 Summary:	KOffice - KSpread
@@ -413,8 +413,9 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-%patch2 -p1
+%patch1 -p1
+#%patch2 -p1
+%patch3 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
 	tools/kthesaurus/KThesaurus.desktop
@@ -955,7 +956,7 @@
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/thesaurustool.desktop
 %{_datadir}/services/kwmailmerge_kabc.desktop
-#this is the mailmerge service info for qtsqldb and classic
+# this is the mailmerge service info for qtsqldb and classic
 %{_datadir}/services/kwserialletter*
 %{_datadir}/templates/.source/TextDocument.kwt
 %{_datadir}/templates/TextDocument.desktop
@@ -973,6 +974,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2006/10/25 18:18:29  glen
+- add kde-common-PLD.patch
+
 Revision 1.161  2006/10/25 16:57:01  czarny
 - up to 1.6 stable
 - patch1 already upstream
@@ -1107,13 +1111,13 @@
 - rel 1
 
 Revision 1.121  2005/08/08 10:42:57  blekot
-- more %%files (needs checkout)
+- more %files (needs checkout)
 - log shorten
 - %if "%{_state}" == "snaphots"  hashed (#), because I've no idea what for is that.
 
 Revision 1.120  2005/08/07 21:28:31  blekot
 - up to 1.4.1
-- %%files not completed (ca 50 files needs to be packed)
+- %files not completed (ca 50 files needs to be packed)
 - patch0 moved to spec ( %{__sed} ). It's easiest way.
 - rel 0.1 (NFY)
 
@@ -1124,7 +1128,7 @@
 - dropped SourceX-size
 
 Revision 1.117  2005/02/12 22:46:25  arekm
-rel ++
+- rel ++
 
 Revision 1.116  2005/02/12 19:50:02  arekm
 - rel ++
@@ -1150,14 +1154,14 @@
 
 Revision 1.58  2002/11/07 00:11:45  ankry
 - added desktop for kudesigner
-- kformula and kudesigner icons moved to toplevel %%{_pixmapdir}
+- kformula and kudesigner icons moved to toplevel %{_pixmapdir}
   (kudesigner as a separate source to be converted to 48x48)
 - moved kudesigner to kugar
 
 Revision 1.57  2002/11/06 23:32:29  ankry
 - finally killed KIllustrator (and also Krayon)
 - utility packages sorted alphabetically
-- restored moving highest-resolution icons to toplevel %%{_pixmapsdir} +
+- restored moving highest-resolution icons to toplevel %{_pixmapsdir} +
   removing other resolution icons
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.161&r2=1.162&f=u