rpms/kdeutils/F-10 kdeutils-4.2.2-ark.patch, NONE, 1.1 kdeutils-4.2.2-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.154, 1.155

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28837

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime
- fix kdeutils-printer-applet dependency
- apply upstream patch to fix several issues in ark



kdeutils-4.2.2-ark.patch:

--- NEW FILE kdeutils-4.2.2-ark.patch ---
--- kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/01/06 17:13:38	906699
+++ kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/04/15 05:07:17	954094
@@ -117,7 +117,7 @@
 		{
 			foreach( const QString& mimeType, service->serviceTypes() )
 			{
-				if ( !mimeType.contains( "Kerfuffle" ) )
+				if ( !mimeType.contains( "Kerfuffle" ) && !supported.contains( mimeType ) )
 				{
 					supported << mimeType;
 				}
--- kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/06 07:13:01	949880
+++ kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/15 04:56:31	954092
@@ -108,7 +108,7 @@
 	else // Try to open it in an external application
 	{
 		KUrl fileUrl( filename );
-		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true, true )->name(), parent );
+		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true )->name(), parent );
 		return;
 	}
 

kdeutils-4.2.2-pykde4.patch:

--- NEW FILE kdeutils-4.2.2-pykde4.patch ---
diff -up kdeutils-4.2.2/CMakeLists.txt.orig kdeutils-4.2.2/CMakeLists.txt
diff -up kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig kdeutils-4.2.2/printer-applet/CMakeLists.txt
--- kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig	2009-04-15 12:18:18.000000000 +0200
+++ kdeutils-4.2.2/printer-applet/CMakeLists.txt	2009-04-15 12:24:37.000000000 +0200
@@ -7,24 +7,9 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdeutils.spec	2 Apr 2009 15:31:02 -0000	1.154
+++ kdeutils.spec	15 Apr 2009 10:58:19 -0000	1.155
@@ -1,12 +1,12 @@
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -18,6 +18,10 @@
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
+Patch1:         kdeutils-4.2.2-pykde4.patch
+# upstream fixes
+Patch100:       kdeutils-4.2.2-ark.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -32,12 +36,6 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
-# printer applet
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -72,6 +70,10 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:4.2.1-3
+
 %description printer-applet
 %{summary}.
 
@@ -90,7 +92,10 @@
 # make kjots build with kdeutils
 %patch0 -p1 -b .kjots
 %endif
+%patch1 -p1 -b .pykde4
 
+# upstream fixes
+%patch100 -p1 -b .ark
 
 %build
 
@@ -195,6 +200,12 @@
 
 
 %changelog
+* Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+- fix kdeutils-printer-applet dependency
+- apply upstream patch to fix several issues in ark
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets