rpms/kdeutils/F-9 kdeutils.spec, 1.141, 1.142 sources, 1.63, 1.64 kdeutils-4.2.2-ark.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

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

Modified Files:
	kdeutils.spec sources 
Removed Files:
	kdeutils-4.2.2-ark.patch 
Log Message:
KDE 4.2.3



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kdeutils.spec	15 Apr 2009 11:00:41 -0000	1.141
+++ kdeutils.spec	6 May 2009 12:40:22 -0000	1.142
@@ -5,8 +5,8 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.2
-Release:        3%{?dist}
+Version:        4.2.3
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -20,7 +20,6 @@ Patch0:         kdeutils-4.2.0-kjots-wit
 %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)
 
@@ -30,12 +29,18 @@ BuildRequires:  plasma-devel >= %{versio
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
+BuildRequires:  python
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
+%if 0%{?fedora} < 11
+# upgrade path so it doesn't get lost
+Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
+%endif
+
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -70,10 +75,6 @@ Group:    Applications/System
 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}.
 
@@ -95,7 +96,6 @@ rm -rf kdepim-%{version}
 %patch1 -p1 -b .pykde4
 
 # upstream fixes
-%patch100 -p1 -b .ark
 
 %build
 
@@ -200,6 +200,12 @@ fi
 
 
 %changelog
+* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
+- 4.2.3
+
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- revert -printer-applet dep changes (and drop for f11+)
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	2 Apr 2009 15:42:56 -0000	1.63
+++ sources	6 May 2009 12:40:22 -0000	1.64
@@ -1,2 +1 @@
-3df5186f9dacddbce48a1c7eb35515cd  kdeutils-4.2.2.tar.bz2
-964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2
+8fddacea28f6c0a6c2ac2462750b7e50  kdeutils-4.2.3.tar.bz2


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