rpms/kdegraphics/F-10 kdegraphics.spec,1.190,1.191

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kdegraphics.spec	3 Apr 2009 17:19:14 -0000	1.190
+++ kdegraphics.spec	27 Apr 2009 16:12:29 -0000	1.191
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        5%{?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,12 +47,14 @@
 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} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# used by okular
+Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Requires: cups
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
@@ -90,16 +95,19 @@
 %description devel
 %{summary}.
 
+%package -n kio_msits
+Group: System Environment/Libraries
+Summary: A kioslave for displaying WinHelp files 
+%description -n kio_msits
+%{summary}.
+
 
 %prep
 %setup -q -n kdegraphics-%{version}
 %patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
-# upstream patches
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -162,7 +170,9 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -171,11 +181,12 @@
 %{_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/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -202,11 +213,12 @@
 %{_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
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -214,15 +226,28 @@
 %{_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
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
+%files -n kio_msits
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_datadir}/kde4/services/msits.protocol
+
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
+
+* 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)