SPECS (AC-branch): koffice.spec - 1.6.2

[glen]

Author: glen                         Date: Sun Feb 18 11:59:18 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 1.6.2

---- Files affected:
SPECS:
   koffice.spec (1.170 -> 1.170.2.1) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.170 SPECS/koffice.spec:1.170.2.1
--- SPECS/koffice.spec:1.170	Wed Dec 20 11:51:44 2006
+++ SPECS/koffice.spec	Sun Feb 18 12:59:13 2007
@@ -1,11 +1,10 @@
 # $Revision$, $Date$
 # TODO:
 #	- move libkexidb*.so to -common package? i.e. kspread needs them.
-#	- fix /usr/share/apps/xsltfilter/export/kword/xslfo issue.
 #	- remove /usr/share/doc/kde/HTML/en/koffice-apidocs parts from non-apidoc packages.
 #
 %define		_state		stable
-%define		_ver		1.6.1
+%define		_ver		1.6.2
 %define		_snap		%{nil}
 %define		artsver		13:1.3.0
 
@@ -17,16 +16,17 @@
 Summary(zh_CN):	KDE ľÄ°ěšŤÓŚÓĂČíźţźŻĄŁ
 Name:		koffice
 Version:	%{_ver}
-Release:	2
+Release:	1
 Epoch:		5
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/koffice-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	f7b90b46b79019edc60761a6bff2d387
+# Source0-md5:	74ef62a5f8f766fe8192d5b7d65a3928
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-python25-64bit.patch
 Patch3:		kde-ac260-lt.patch
+Patch4:		%{name}-paths.patch
 URL:		http://www.koffice.org/
 BuildRequires:	GraphicsMagick-devel >= 1.1.7
 BuildRequires:	ImageMagick-c++-devel >= 1:6.2.4.0
@@ -56,6 +56,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	ruby-devel
 BuildRequires:	sed >= 4.0
+BuildRequires:	which
 BuildRequires:	wv2-devel >= 0.1.9
 BuildRequires:	zlib-devel
 Requires:	wv2 >= 0.1.9
@@ -395,6 +396,7 @@
 %patch1 -p1
 #%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
 	tools/kthesaurus/KThesaurus.desktop
@@ -479,6 +481,9 @@
 %find_lang thesaurus		--with-kde
 cat thesaurus.lang >> kword.lang
 
+rm $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh
+rm $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -931,6 +936,10 @@
 %attr(755,root,root) %{_libdir}/kde3/kwmailmerge_qtsqldb*.so
 %{_datadir}/apps/kword
 %{_datadir}/apps/thesaurus
+%dir %{_datadir}/apps/xsltfilter
+%dir %{_datadir}/apps/xsltfilter/export
+%dir %{_datadir}/apps/xsltfilter/export/kword
+%dir %{_datadir}/apps/xsltfilter/export/kword/xslfo
 %{_datadir}/apps/xsltfilter/export/kword/xslfo/*.xsl
 %{_datadir}/apps/konqueror/servicemenus/kword_konqi.desktop
 %{_datadir}/services/kfile_abiword.desktop
@@ -955,6 +964,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170.2.1  2007/02/18 11:59:13  glen
+- 1.6.2
+
 Revision 1.170  2006/12/20 10:51:44  hawk
 - release 2 to rebuild with PostgreSQL 8.2
 
================================================================

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