rpms/koffice/devel koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 koffice.spec, 1.42, 1.43 sources, 1.12, 1.13

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Fri Oct 20 13:44:12 UTC 2006


Author: awjb

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

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Aug 2006 09:15:26 -0000	1.12
+++ .cvsignore	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- koffice.spec	4 Oct 2006 19:38:54 -0000	1.42
+++ koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
@@ -1,14 +1,14 @@
 Name:           koffice
-Version:        1.5.2
-Release:        3%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
-
+Patch0:         koffice-1.6.0.patch
 # stuff for the build configuration
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -216,6 +216,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -443,6 +444,8 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
 %{_datadir}/apps/kspread/
 %{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
@@ -516,6 +519,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -550,8 +555,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -569,7 +572,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -583,6 +585,21 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
 %{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -768,9 +785,11 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
 %{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
@@ -786,6 +805,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0
+- version upgrade
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - 1.5.3-3
 - respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Aug 2006 09:15:26 -0000	1.12
+++ sources	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2




More information about the scm-commits mailing list