rpms/kdeutils/F-11 kdeutils-4.2.85-pykde4.patch, NONE, 1.1 .cvsignore, 1.64, 1.65 kdeutils.spec, 1.178, 1.179 sources, 1.65, 1.66 kdeutils-4.2.2-pykde4.patch, 1.1, NONE kdeutils-4.2.4-ark_servicepack.patch, 1.1, NONE

Wed Aug 5 13:12:36 UTC 2009

Author: rdieter

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Added Files:
	kdeutils-4.2.85-pykde4.patch 
Removed Files:
	kdeutils-4.2.2-pykde4.patch 
	kdeutils-4.2.4-ark_servicepack.patch 
Log Message:
kde-4.3.0


kdeutils-4.2.85-pykde4.patch:
 CMakeLists.txt |   21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

--- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	31 May 2009 15:10:23 -0000	1.64
+++ .cvsignore	5 Aug 2009 13:12:35 -0000	1.65
@@ -1 +1,5 @@
-kdeutils-4.2.4.tar.bz2
+kdeutils-4.2.90.tar.bz2
+kdeutils-4.2.95.tar.bz2
+kdeutils-4.2.96.tar.bz2
+kdeutils-4.2.98.tar.bz2
+kdeutils-4.3.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdeutils.spec	28 Jun 2009 20:37:22 -0000	1.178
+++ kdeutils.spec	5 Aug 2009 13:12:36 -0000	1.179
@@ -1,12 +1,10 @@
-%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
-%define include_kjots 1
-%endif
+# define to include applet
+%define printer_applet 1
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -14,68 +12,74 @@ Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%if 0%{?include_kjots}
-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
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://bugzilla.redhat.com/504136
-Patch100: kdeutils-4.2.4-ark_servicepack.patch
+Patch1:         kdeutils-4.2.85-pykde4.patch
+
+## upstreamed patches
+
+## upstream fixes
+
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
+BuildRequires:  desktop-file-utils
+BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  python
+BuildRequires:  python-devel python
+BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
-
+%if 0%{?printer_applet}
 %if 0%{?fedora} < 11
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
+%else
+Obsoletes: %{name}-printer-applet < %{epoch}:%{version}-%{release}
+%endif
 
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
-Obsoletes: kdeutils-libs < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
+Obsoletes: kdeutils < 6:4.3.0-2
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
 Includes:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-%if 0%{?include_kjots}
-  * kjots (note taker)
-%endif
-  * ktimer (task scheduler)
-  * kwalletmanager (kde wallet management Tool)
-  * kwikdisk (removable media utility)
-  * okteta (binary/hex editor)
+  * ark: tar/gzip archive manager
+  * kcalc: scientific calculator
+  * kcharselect: character selector
+  * kdelirc: Linux Infrared Remote Control frontend 
+  * kdessh: ssh front end
+  * kdf: view disk usage
+  * kfloppy: floppy formatting tool
+  * kgpg: gpg gui
+  * ktimer: task scheduler
+  * kwalletmanager: kde wallet management tool
+  * okteta: binary/hex editor
   * superkaramba
-  * sweeper (clean unwanted traces the user leaves on the system)
+  * sweeper: clean unwanted traces the user leaves on the system
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
 
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4 
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
 %description printer-applet
@@ -84,31 +88,18 @@ Requires: system-config-printer-libs
 
 %prep
 %setup -q
-%if 0%{?include_kjots}
-# unpack kdepim
-%setup -q -T -D -a 1
-# extract kjots
-mv -f kdepim-%{version}/kjots .
-# extract kjots documentation
-mv -f kdepim-%{version}/doc/kjots doc
-# get rid of the rest of kdepim
-rm -rf kdepim-%{version}
-# make kjots build with kdeutils
-%patch0 -p1 -b .kjots
-%endif
-%patch1 -p1 -b .pykde4
-
-%patch100 -p1 -b .ark_servicepack
 
-
-# upstream fixes
+# NEEDSWORK
+#patch1 -p1 -b .pykde4
 
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  %{?printer_applet:-DINSTALL_PRINTER_APPLET=TRUE} \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -120,19 +111,28 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
-rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
-# FIXME: if something builds against these, there should be a -devel package
+rm -f %{buildroot}%{_kde4_libdir}/libokteta{core,gui}.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdelirc_shared.so
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+# make an exception for irkick service-style .desktop, while we consult
+# upstream
+  if [ "`basename $f .desktop`" != "irkick" ]; then
+  desktop-file-validate $f
+  fi
+done
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -142,7 +142,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -151,11 +150,16 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/ark
+%{_kde4_bindir}/irkick
 %{_kde4_bindir}/kcalc
 %{_kde4_bindir}/kcharselect
 %{_kde4_bindir}/kdessh
@@ -169,6 +173,7 @@ fi
 %{_kde4_bindir}/superkaramba
 %{_kde4_bindir}/sweeper
 %{_kde4_appsdir}/ark/
+%{_kde4_appsdir}/irkick/
 %{_kde4_appsdir}/kcalc/
 %{_kde4_appsdir}/kcharselect/
 %{_kde4_appsdir}/kconf_update/*
@@ -177,44 +182,70 @@ fi
 %{_kde4_appsdir}/kwalletmanager/
 %{_kde4_appsdir}/okteta/
 %{_kde4_appsdir}/oktetapart/
+%{_kde4_appsdir}/profiles/
+%{_kde4_appsdir}/remotes/
 %{_kde4_appsdir}/superkaramba/
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/autostart/irkick.desktop
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
-%{_kde4_libdir}/kde4/*
-%if 0%{?include_kjots}
-%{_kde4_bindir}/kjots
-%{_kde4_appsdir}/kjots/
-%{_kde4_docdir}/HTML/en/kjots/
-%endif
+%{_kde4_libdir}/kde4/*.so
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
+%if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
 %{_kde4_bindir}/printer-applet
 %{_kde4_datadir}/autostart/printer-applet.desktop
 %{_kde4_appsdir}/printer-applet/
+%endif
 
 
 %changelog
-* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-2
+- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 6:4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 - Add support for PackageKit service packs (#504136)
 
-* Sun May 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- remove F9 kjots hack
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable printer-applet
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu May 14 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - revert -printer-applet dep changes (and drop for f11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	31 May 2009 15:10:23 -0000	1.65
+++ sources	5 Aug 2009 13:12:36 -0000	1.66
@@ -1 +1 @@
-e7214cb1e84d2e6793d3dbeb8f33a3fe  kdeutils-4.2.4.tar.bz2
+9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2


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


--- kdeutils-4.2.4-ark_servicepack.patch DELETED ---


