rpms/koffice/F-12 koffice-1.6.3-no_kexi_examples.patch, NONE, 1.1 koffice.spec, 1.121, 1.122

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31001

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-no_kexi_examples.patch 
Log Message:
try to workaround kexi/examples borkage


koffice-1.6.3-no_kexi_examples.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-1.6.3-no_kexi_examples.patch ---
diff -up koffice-1.6.3/kexi/Makefile.am.no_kexi_examples koffice-1.6.3/kexi/Makefile.am
--- koffice-1.6.3/kexi/Makefile.am.no_kexi_examples	2007-05-30 16:36:09.000000000 -0500
+++ koffice-1.6.3/kexi/Makefile.am	2009-09-29 19:40:47.418252396 -0500
@@ -8,7 +8,7 @@ kexi_la_LDFLAGS = $(all_libraries) -modu
 kexi_la_LIBADD = ./core/libkexicore.la ./main/libkeximain.la
 
 SUBDIRS= 3rdparty kexiutils kexidb core widget formeditor \
-data pics main migration plugins . tests examples tools
+data pics main migration plugins . tests tools
 
 #(will be reenabled after main/startup move)
 


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/koffice.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- koffice.spec	26 Sep 2009 18:19:02 -0000	1.121
+++ koffice.spec	30 Sep 2009 00:42:31 -0000	1.122
@@ -49,6 +49,9 @@ Patch3: koffice-1.6.3-gcc43.patch
 # drop need/use of local fonts, use dejavu instead of arev
 Patch4: koffice-1.6.3-dejavu_fonts.patch
 
+# skip/omit kexi examples (which crash on ppc)
+Patch5: koffice-1.6.3-no_kexi_examples.patch
+
 # BuildRequires: world-devel ;)
 BuildRequires:  %{kdelibs3}-devel
 # See http://bugzilla.redhat.com/244091
@@ -75,7 +78,6 @@ BuildRequires:  perl
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
-BuildRequires:  aspell-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
@@ -95,6 +97,7 @@ BuildRequires: libwpd-devel
 %define libwpd 1
 BuildRequires: poppler-qt-devel
 %endif
+#BuildRequires: sqlite-devel
 
 
 %description
@@ -281,6 +284,8 @@ sed -i.dejavu-lgc \
   -e 's|dejavu sans|dejavu lgc sans|' \
   lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
 
+%patch -p1 -b .no_kexi_examples
+
 %patch50 -p1 -b glibc_strrchr
 
 # hack/fix for newer automake