rpms/kdelibs/devel .cvsignore, 1.84, 1.85 kdelibs.spec, 1.553, 1.554 sources, 1.100, 1.101 kdelibs-4.3.80-fix-kauth-polkitqt-1.patch, 1.1, NONE kubuntu_80_kaction_qt_keys.diff, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.80-fix-kauth-polkitqt-1.patch 
	kubuntu_80_kaction_qt_keys.diff 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	2 Dec 2009 13:21:54 -0000	1.84
+++ .cvsignore	18 Dec 2009 14:29:01 -0000	1.85
@@ -1 +1 @@
-kdelibs-4.3.80.tar.bz2
+kdelibs-4.3.85.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -p -r1.553 -r1.554
--- kdelibs.spec	16 Dec 2009 16:05:23 -0000	1.553
+++ kdelibs.spec	18 Dec 2009 14:29:01 -0000	1.554
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: KDE Libraries
-Version: 4.3.80
-Release: 5%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,15 +80,12 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
-# kubuntu working to upstream this
-Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
-# Another backported typo fix, this one for KAuth PolkitQt-1
-Patch101: kdelibs-4.3.80-fix-kauth-polkitqt-1.patch
 
 # security fix
+## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
-BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: qt4-devel >= 4.6.0
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig
@@ -216,15 +213,12 @@ format for easy browsing.
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
 %endif
 
-# Kubuntu patch
-%patch50 -p1 -b .kaction_qt_keys
-
 # upstream patches
-%patch101 -p0 -b .kauth-polkitqt-1
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
 
+
 %build
 
 # add release version
@@ -415,6 +409,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- 4.3.85 (4.4 beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	4 Dec 2009 15:20:31 -0000	1.100
+++ sources	18 Dec 2009 14:29:01 -0000	1.101
@@ -1 +1 @@
-3d4fe702be4a85c02e56e80a8f06ae76  kdelibs-4.3.80.tar.bz2
+b5deca5371719875d10ef63a37c7c2b8  kdelibs-4.3.85.tar.bz2


--- kdelibs-4.3.80-fix-kauth-polkitqt-1.patch DELETED ---


--- kubuntu_80_kaction_qt_keys.diff DELETED ---