rpms/kdegraphics/F-11 kdegraphics.spec,1.195,1.196
Than Ngo
than at fedoraproject.org
Wed Apr 22 12:21:39 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1993
Modified Files:
kdegraphics.spec
Log Message:
fix build issue on s390(x)
Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kdegraphics.spec 3 Apr 2009 15:30:31 -0000 1.195
+++ kdegraphics.spec 22 Apr 2009 12:21:37 -0000 1.196
@@ -7,7 +7,7 @@
Summary: K Desktop Environment - Graphics Applications
Epoch: 7
Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Name: kdegraphics
#Obsoletes: kdegraphics4 < %{version}-%{release}
@@ -32,11 +32,14 @@
BuildRequires: exiv2-devel
BuildRequires: giflib-devel
BuildRequires: lcms-devel
+%ifnarch s390 s390x
%if 0%{?fedora} > 9
BuildRequires: libgphoto2-devel
%else
BuildRequires: gphoto2-devel
%endif
+BuildRequires: sane-backends-devel
+%endif
BuildRequires: libspectre-devel
BuildRequires: libtiff-devel
BuildRequires: libXxf86vm-devel
@@ -44,7 +47,6 @@
BuildRequires: poppler-qt4-devel
BuildRequires: qca2-devel
BuildRequires: qimageblitz-devel
-BuildRequires: sane-backends-devel
BuildRequires: soprano-devel
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -171,11 +173,13 @@
%{_kde4_appsdir}/svgpart/
%{_kde4_libdir}/kde4/gsthumbnail.so
%{_kde4_libdir}/kde4/gvpart.so
+%ifnarch s390 s390x
%{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kcm_kgamma.so
%{_kde4_libdir}/kde4/kio_kamera.so
-%{_kde4_libdir}/kde4/kio_msits.so
%{_kde4_libdir}/kde4/ksaneplugin.so
+%endif
+%{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/kio_msits.so
%{_kde4_libdir}/kde4/okularGenerator_*.so
%{_kde4_libdir}/kde4/okularpart.so
%{_kde4_libdir}/kde4/svgpart.so
@@ -202,7 +206,9 @@
%{_kde4_libdir}/libkexiv2.so.7*
%{_kde4_libdir}/libkipi.so.6*
%{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%ifnarch s390 s390x
%{_kde4_libdir}/libksane.so.0*
+%endif
%{_kde4_libdir}/libokularcore.so.1*
%{_kde4_libdir}/strigi/strigita_dvi.so
@@ -214,7 +220,9 @@
%{_kde4_includedir}/libkexiv2/
%{_kde4_includedir}/libkipi/
%endif
+%ifnarch s390 s390x
%{_kde4_includedir}/libksane/
+%endif
%{_kde4_includedir}/okular/
%{_kde4_libdir}/lib*.so
%{_kde4_appsdir}/cmake/modules/FindKSane.cmake
@@ -223,6 +231,9 @@
%changelog
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- fix build issue on s390(x)
+
* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
- work around Kolourpaint crash with Qt 4.5 (kde#183850)
More information about the fedora-extras-commits
mailing list