rpms/koffice/FC-5 koffice-1.6.2-kdchart_export.patch, NONE, 1.1 koffice-1.6.2-kexi_export.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 koffice.spec, 1.44, 1.45 sources, 1.14, 1.15

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Mar 5 13:08:41 UTC 2007 

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
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-3
- 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
- -krita: +Requires: koffice-filters (#228204)



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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Dec 2006 22:06:54 -0000	1.14
+++ .cvsignore	5 Mar 2007 13:08:09 -0000	1.15
@@ -1,3 +1,4 @@
 koffice-1.6.0.tar.bz2
 koffice-1.6.1.tar.bz2
 koshell.png
+koffice-1.6.2.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- koffice.spec	26 Jan 2007 13:17:36 -0000	1.44
+++ koffice.spec	5 Mar 2007 13:08:09 -0000	1.45
@@ -1,7 +1,7 @@
 
 Name:           koffice
-Version:        1.6.1
-Release:        4%{?dist}
+Version:        1.6.2
+Release:        3%{?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 ;)
@@ -23,9 +26,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 3
 BuildRequires:  GraphicsMagick-devel
-%endif
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -51,11 +52,11 @@
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%if 0%{?fedora} > 5 || 0%{?rhel} > 3
 BuildRequires:  poppler-qt-devel
-BuildRequires:  libpaper-devel
 %endif
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
 %endif
 
@@ -159,6 +160,7 @@
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+Requires:	%{name}-filters
 
 %description krita
 %{summary}
@@ -233,6 +235,9 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .kexi_export
+%patch2 -p1 -b .kdchart_export
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -277,7 +282,10 @@
   --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
+# shouldn't these be in koffice-l10n? 
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
 
 
 %clean
@@ -533,7 +541,7 @@
 
 %files kexi
 %defattr(-,root,root,-)
-%{_bindir}/kexi
+%{_bindir}/kexi*
 %{_bindir}/ksqlite*
 %{_bindir}/krossrunner
 %{_libdir}/libkdeinit_kexi.so
@@ -556,6 +564,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) %{_datadir}/locale/pl/LC_MESSAGES/kexi*
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
@@ -673,18 +683,28 @@
 
 
 %changelog
+* Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-3
+- 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
+- -krita: +Requires: koffice-filters (#228204)
+
 * Mon Dec 11 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-4
+1.6.1-4
 - -devel: +%%defattr
 - -libs: (new) subpkg, multilib issues
 - BR: +libpaper-devel -graphviz-devel
 
 * Sun Dec 10 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-3
+1.6.1-3
 - -devel %%files: +%%exclude %%_libdir/libkdeinit_*.so
 
 * Sat Dec 09 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-2
+1.6.1-2
 - BR: poppler-qt-devel (#158941,#212145)
 
 * Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Dec 2006 22:06:54 -0000	1.14
+++ sources	5 Mar 2007 13:08:09 -0000	1.15
@@ -1,2 +1,2 @@
 03382edf62db9913b57ad8760c7d5f52  koshell.png
-f7b90b46b79019edc60761a6bff2d387  koffice-1.6.1.tar.bz2
+74ef62a5f8f766fe8192d5b7d65a3928  koffice-1.6.2.tar.bz2

More information about the fedora-extras-commits mailing list