rpms/koffice/FC-6 koffice-1.6.2-kdchart_export.patch, NONE, 1.1 koffice-1.6.2-kexi_export.patch, NONE, 1.1 koffice.spec, 1.47, 1.48

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.2-kdchart_export.patch 
	koffice-1.6.2-kexi_export.patch 
Log Message:
awol patches


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/FC-6/koffice.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- koffice.spec	4 Mar 2007 23:30:55 -0000	1.47
+++ koffice.spec	4 Mar 2007 23:45:31 -0000	1.48
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity