rpms/kdegraphics/F-11 kdegraphics.spec,1.196,1.197

[Rex Dieter]

Author: rdieter

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

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-11/kdegraphics.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kdegraphics.spec	22 Apr 2009 12:21:37 -0000	1.196
+++ kdegraphics.spec	27 Apr 2009 15:13:34 -0000	1.197
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -52,6 +52,9 @@
 %{?_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 
@@ -92,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} ..
@@ -164,7 +170,8 @@
 %{_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/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -179,7 +186,6 @@
 %{_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
@@ -212,7 +218,6 @@
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -229,8 +234,16 @@
 %{_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)