rpms/kdeutils/devel kdeutils-4.2.85-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.174, 1.175 kdeutils-4.2.2-ark.patch, 1.1, NONE kdeutils-4.2.2-pykde4.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11837

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.85-pykde4.patch 
Removed Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
update patches


kdeutils-4.2.85-pykde4.patch:

--- NEW FILE kdeutils-4.2.85-pykde4.patch ---
diff -up kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4 kdeutils-4.2.85/printer-applet/CMakeLists.txt
--- kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4	2009-04-28 08:45:59.000000000 -0500
+++ kdeutils-4.2.85/printer-applet/CMakeLists.txt	2009-05-17 10:03:09.381947455 -0500
@@ -4,24 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
 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(PyKDE4)
-IF(NOT PYKDE4_FOUND)
-    macro_log_feature(PYKDE4_FOUND "PyKDE4" "PyKDE4 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 PYKDE4_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 PYKDE4_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_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/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- kdeutils.spec	14 May 2009 13:40:35 -0000	1.174
+++ kdeutils.spec	17 May 2009 15:05:45 -0000	1.175
@@ -18,15 +18,15 @@ Source0:        ftp://ftp.kde.org/pub/kd
 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)
 
+Patch1:         kdeutils-4.2.85-pykde4.patch
+## upstream fixes
+
+
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  plasma-devel >= %{version}
+#BuildRequires:  kdepimlibs-devel >= %{version}
+#BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
@@ -96,8 +96,6 @@ rm -rf kdepim-%{version}
 %endif
 %patch1 -p1 -b .pykde4
 
-# upstream fixes
-%patch100 -p1 -b .ark
 
 %build
 


--- kdeutils-4.2.2-ark.patch DELETED ---


--- kdeutils-4.2.2-pykde4.patch DELETED ---