rpms/koffice/F-10 koffice.spec,1.78,1.79

[Rex Dieter]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
merge EL-5 branch mods



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- koffice.spec	13 Oct 2008 15:37:50 -0000	1.78
+++ koffice.spec	14 Oct 2008 20:48:04 -0000	1.79
@@ -43,14 +43,12 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  GraphicsMagick-devel
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  pcre-devel
-BuildRequires:  libwpd-devel
 BuildRequires:  lcms-devel
 BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
@@ -69,11 +67,18 @@
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
-BuildRequires:  poppler-qt-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
 %endif
+# FIXME: work to get these into EPEL
+%if 0%{?fedora} > 6
+BuildRequires: GraphicsMagick-devel
+BuildRequires: libwpd-devel
+%define libwpd 1
+BuildRequires: poppler-qt-devel
+%endif
+
 
 %description
 KOffice is an integrated office suite.
@@ -682,7 +687,9 @@
 %{_libdir}/kde3/libwmlexport.*
 %{_libdir}/kde3/libwmlimport.*
 %{_libdir}/kde3/libwpexport.*
+%if 0%{?libwpd}
 %{_libdir}/kde3/libwpimport.*
+%endif
 %{_libdir}/kde3/libmswordimport.*
 %{_libdir}/kde3/libxsltimport.*
 %{_libdir}/kde3/libxsltexport.*