rpms/koffice/devel koffice-krita-kisclipboard.patch, NONE, 1.1 koffice.spec, 1.17, 1.18

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Thu Dec 15 08:19:09 UTC 2005


Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12139

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisclipboard.patch 
Log Message:
- more krita compile fixes


koffice-krita-kisclipboard.patch:

--- NEW FILE koffice-krita-kisclipboard.patch ---
--- branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/10/18 12:57:53	471689
@@ -35,7 +35,7 @@
 
 public:
 
-	virtual KisClipboard::~KisClipboard();
+	virtual ~KisClipboard();
 
 	static KisClipboard* instance();


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- koffice.spec	13 Dec 2005 09:55:06 -0000	1.17
+++ koffice.spec	15 Dec 2005 08:19:07 -0000	1.18
@@ -16,7 +16,7 @@
 Patch1:         koffice-CAN-2005-3193.diff
 
 Patch100:       koffice-krita-kisfilter.patch
-
+Patch101:       koffice-krita-kisclipboard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -198,6 +198,7 @@
 %patch0 -p1
 %patch1
 %patch100
+%patch101 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -754,7 +755,7 @@
 * Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fix
+- add krita compile fixs
 
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2




More information about the scm-commits mailing list