rpms/koffice/devel koffice-1.6.2-kdchart_export.patch, NONE, 1.1 koffice-1.6.2-kexi_export.patch, NONE, 1.1 koffice.spec, 1.51, 1.52

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.2-kdchart_export.patch 
	koffice-1.6.2-kexi_export.patch 
Log Message:
* Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.2-2
- kexi_export patch
- kdchart_export patch (#222965)


koffice-1.6.2-kdchart_export.patch:

--- NEW FILE koffice-1.6.2-kdchart_export.patch ---
--- koffice-1.6.2/kchart/kdchart/kdchart_export.h.kdchart_export	2007-02-12 06:28:32.000000000 -0600
+++ koffice-1.6.2/kchart/kdchart/kdchart_export.h	2007-02-26 07:54:19.000000000 -0600
@@ -4,7 +4,7 @@
 #include <qglobal.h>
 
 #if 1
-#include <../../lib/kofficecore/koffice_export.h>
+#include <koffice_export.h>
 #else
 
 #if defined(Q_OS_WIN32) && defined(KDCHART_DLL)

koffice-1.6.2-kexi_export.patch:

--- NEW FILE koffice-1.6.2-kexi_export.patch ---
--- koffice-1.6.2/kexi/examples/update_sql_files.sh.export	2007-02-12 06:23:28.000000000 -0600
+++ koffice-1.6.2/kexi/examples/update_sql_files.sh	2007-02-26 07:50:28.000000000 -0600
@@ -5,8 +5,8 @@
 # ksqlite is needed on the PATH
 
 KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
-PATH=$PATH:$KEXISQL3PATH
-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
+PATH=$PATH:$KEXISQL3PATH; export PATH
+LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH; export LD_LIBRARY_PATH
 which ksqlite > /dev/null || exit 1
 
 for f in `ls -1 *.kexi` ; do
--- koffice-1.6.2/kexi/examples/build_kexi_file.sh.export	2007-02-12 06:23:28.000000000 -0600
+++ koffice-1.6.2/kexi/examples/build_kexi_file.sh	2007-02-26 07:50:16.000000000 -0600
@@ -8,8 +8,8 @@
 # ksqlite is needed on the $PATH.
 
 KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
-PATH=$PATH:$KEXISQL3PATH
-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
+PATH=$PATH:$KEXISQL3PATH; export PATH
+LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH; export LD_LIBRARY_PATH
 which ksqlite > /dev/null || exit 1
 
 [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- koffice.spec	23 Feb 2007 20:23:58 -0000	1.51
+++ koffice.spec	26 Feb 2007 15:14:05 -0000	1.52
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -10,6 +10,9 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:         koffice-1.6.2-kexi_export.patch
+Patch2:         koffice-1.6.2-kdchart_export.patch
+
 Source100:      koshell.png
 
 # BuildRequires: world-devel ;)
@@ -232,6 +235,9 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .kexi_export
+%patch2 -p1 -b .kdchart_export
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -276,7 +282,8 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -532,7 +539,7 @@
 
 %files kexi
 %defattr(-,root,root,-)
-%{_bindir}/kexi
+%{_bindir}/kexi*
 %{_bindir}/ksqlite*
 %{_bindir}/krossrunner
 %{_libdir}/libkdeinit_kexi.so
@@ -555,6 +562,8 @@
 %{_datadir}/doc/HTML/en/kexi/
 %{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
+# shouldn't this be in koffice-l10n?
+%lang(pl) %{_docdir}/locale/pl/LC_MESSAGES/kexi*
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
@@ -672,6 +681,11 @@
 
 
 %changelog
+* Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-2
+- kexi_export patch
+- kdchart_export patch (#222965)
+
 * Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.2-1
 - koffice-1.6.2