rpms/koffice/FC-5 koffice-kexi-version.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 koffice.spec, 1.34, 1.35 sources, 1.9, 1.10

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Sun Apr 16 22:05:51 UTC 2006


Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/FC-5

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-kexi-version.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Mar 2006 12:07:42 -0000	1.9
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.0-rc1.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koffice.spec	31 Mar 2006 08:22:02 -0000	1.34
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.35
@@ -1,17 +1,17 @@
 Name:           koffice
 Version:        1.5.0
-Release:        0.1.rc1%{?dist}
+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/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-filters-krita-tiff.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -78,6 +78,8 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
@@ -171,6 +173,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -206,9 +225,9 @@
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
-%patch1 -p4
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -221,7 +240,7 @@
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
 --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final --enable-kexi-reports
+--enable-final
 
 make
 
@@ -351,13 +370,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
-
 #kchart
 desktop-file-install \
   --vendor=fedora \
@@ -513,6 +525,8 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
 # why is this still here on fc5 and not on devel?
 %exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
@@ -693,6 +707,7 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -718,7 +733,8 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -740,13 +756,9 @@
 %{_libdir}/libkexisql3.so.*
 %{_libdir}/libkformdesigner.so.*
 %{_libdir}/libkexiutils.so.*
-%{_libdir}/libkexireportutils.so.*
-%{_libdir}/kde3/kexihandler_report.*
-%{_libdir}/kde3/kexireportwidgets.*
 %{_libdir}/kde3/kformdesigner_containers.*
 %{_libdir}/kde3/kformdesigner_kexidbwidgets.*
 %{_libdir}/kde3/kformdesigner_stdwidgets.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
 %{_libdir}/kde3/kexihandler_form.*
@@ -755,16 +767,10 @@
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
 %{_libdir}/libkrossapi.so.*
 %{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
@@ -772,14 +778,25 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
 %{_datadir}/services/kformdesigner/*
 %{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
@@ -896,6 +913,12 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
 * Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-0.1.rc1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Mar 2006 12:07:42 -0000	1.9
+++ sources	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2




More information about the scm-commits mailing list