rpms/kdelibs/F-10 .cvsignore, 1.67, 1.68 kdelibs.spec, 1.438, 1.439 sources, 1.82, 1.83 kdelibs-4.3.1-copyrename.patch, 1.1, NONE kdelibs-4.3.1-copyurls.patch, 1.1, NONE kdelibs-4.3.1-kdebug#199557.patch, 1.1, NONE kdelibs-4.3.1-kdebug#202550.patch, 1.1, NONE kdelibs-4.3.1-toolbarEditCrash.patch, 1.1, NONE kdelibs-4.3.1-unmountfix.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-copyrename.patch kdelibs-4.3.1-copyurls.patch 
	kdelibs-4.3.1-kdebug#199557.patch 
	kdelibs-4.3.1-kdebug#202550.patch 
	kdelibs-4.3.1-toolbarEditCrash.patch 
	kdelibs-4.3.1-unmountfix.patch 
Log Message:
KDE 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	4 Aug 2009 19:32:57 -0000	1.67
+++ .cvsignore	1 Sep 2009 17:41:47 -0000	1.68
@@ -1,2 +1 @@
-kdelibs-4.2.98.tar.bz2
-kdelibs-4.3.0.tar.bz2
+kdelibs-4.3.1.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -p -r1.438 -r1.439
--- kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.438
+++ kdelibs.spec	1 Sep 2009 17:41:47 -0000	1.439
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,17 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
-# http://bugs.kde.org/202550
-Patch100: kdelibs-4.3.1-kdebug#202550.patch
-# http://bugs.kde.org/199557
-Patch101: kdelibs-4.3.1-kdebug#199557.patch
-Patch102: kdelibs-4.3.1-unmountfix.patch
-# http://bugs.kde.org/170608
-Patch103: kdelibs-4.3.1-copyurls.patch
-# http://bugs.kde.org/195385
-Patch104: kdelibs-4.3.1-copyrename.patch
-# http://bugs.kde.org/200815
-Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -126,6 +115,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
@@ -133,8 +123,8 @@ BuildRequires: phonon-devel >= %{phonon_
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
 BuildRequires: strigi-devel >= %{strigi_ver} 
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
@@ -211,15 +201,9 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -228,15 +212,13 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
-%patch100 -p4 -b .kdebug#202550
-%patch101 -p4 -b .kdebug#199557
-%patch102 -p0 -b .unmountfix
-%patch103 -p0 -b .copyurls
-%patch104 -p0 -b .copyrename
-%patch105 -p0 -b .toolbarEditCrash
+
 
 %build
 
+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
@@ -415,6 +397,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- BR: xz-devel
+
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
 * Wed Aug 19 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-6
 - fix crash when editting toolbars (kdebug:200815)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	4 Aug 2009 19:32:57 -0000	1.82
+++ sources	1 Sep 2009 17:41:47 -0000	1.83
@@ -1 +1 @@
-ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2
+df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2


--- kdelibs-4.3.1-copyrename.patch DELETED ---


--- kdelibs-4.3.1-copyurls.patch DELETED ---


--- kdelibs-4.3.1-kdebug#199557.patch DELETED ---


--- kdelibs-4.3.1-kdebug#202550.patch DELETED ---


--- kdelibs-4.3.1-toolbarEditCrash.patch DELETED ---


--- kdelibs-4.3.1-unmountfix.patch DELETED ---