SPECS: koffice.spec - up to 1.4.2 - cleanups - is patch CAN-2005-0...

zawadaa zawadaa at pld-linux.org
Fri Oct 14 23:15:14 CEST 2005


Author: zawadaa                      Date: Fri Oct 14 21:15:14 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.4.2
- cleanups
- is patch CAN-2005-0064 needed?? - this was for 1.3.5

---- Files affected:
SPECS:
   koffice.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.132 SPECS/koffice.spec:1.133
--- SPECS/koffice.spec:1.132	Fri Oct 14 16:30:26 2005
+++ SPECS/koffice.spec	Fri Oct 14 23:15:08 2005
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %define		_state		stable
-%define		_ver		1.4.1
+%define		_ver		1.4.2
 %define		_snap		%{nil}
 %define		artsver		13:1.3.0
 
@@ -14,15 +14,13 @@
 Summary(zh_CN):	KDE ľÄ°ěšŤÓŚÓĂČíźţźŻĄŁ
 Name:		koffice
 Version:	%{_ver}
-Release:	6
+Release:	0.1
 Epoch:		5
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	91a7b68757addc5934c5a8209a4926d5
+# Source0-md5:	6b456fb7d54c84b11396b27a96ae0cf8
 Patch0:		%{name}-CAN-2005-0064.patch
-Patch1:		%{name}-ui.patch
-Patch2:		ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/post-koffice-1.4.1-rtfimport.diff
 URL:		http://www.koffice.org/
 BuildRequires:	ImageMagick-c++-devel >= 1:6.2.4.0
 BuildRequires:	arts-qt-devel >= %{artsver}
@@ -359,8 +357,6 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
-%patch2 -p0
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
 	tools/kthesaurus/KThesaurus.desktop
@@ -422,7 +418,6 @@
 install -d $RPM_BUILD_ROOT{%{_desktopdir}/kde,%{_mandir}/man1}
 
 mv $RPM_BUILD_ROOT{/usr/share/applnk/Office/*,%{_desktopdir}/kde}
-mv $RPM_BUILD_ROOT{/usr/share/applnk/Utilities/kformdesigner.desktop,%{_desktopdir}/kde}
 
 install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -782,6 +777,7 @@
 %{_datadir}/apps/kugar
 %{_datadir}/services/kugar_kugar_import.desktop
 %{_datadir}/services/kugarpart.desktop
+%{_iconsdir}/*/*/*/kudesigner.png
 %{_iconsdir}/*/*/*/kugar.png
 %{_iconsdir}/*/*/mimetypes/kugardata.png
 %{_mandir}/man1/kudesigner.1*
@@ -862,6 +858,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2005/10/14 21:15:08  zawadaa
+- up to 1.4.2
+- cleanups
+- is patch CAN-2005-0064 needed?? - this was for 1.3.5
+
 Revision 1.132  2005/10/14 14:30:26  glen
 - add fix for CAN-2005-2971; rel 6
 
================================================================

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




More information about the pld-cvs-commit mailing list