SPECS: koffice.spec - up to 1.6 stable - patch1 already upstream

[czarny]

Author: czarny                       Date: Wed Oct 25 16:57:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.6 stable
- patch1 already upstream

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

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.160 SPECS/koffice.spec:1.161
--- SPECS/koffice.spec:1.160	Tue Oct 10 15:09:54 2006
+++ SPECS/koffice.spec	Wed Oct 25 18:57:01 2006
@@ -14,8 +14,8 @@
 #	- 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		unstable
-%define		_ver		1.5.92
+%define		_state		stable
+%define		_ver		1.6.0
 %define		_snap		%{nil}
 %define		artsver		13:1.3.0
 
@@ -31,9 +31,9 @@
 Epoch:		5
 License:	GPL/LGPL
 Group:		X11/Applications
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/koffice-%{version}/src/%{name}-%{version}.tar.bz2
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/koffice-1.6-rc1/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	2134a0d09a3f98b91a062c7bafb57622
+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
@@ -413,7 +413,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
@@ -973,6 +973,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2006/10/25 16:57:01  czarny
+- up to 1.6 stable
+- patch1 already upstream
+
 Revision 1.160  2006/10/10 13:09:54  pluto
 - TODO added.
 
================================================================

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