[kdelibs] 4.8.1

[Radek Novacek]

commit 16d10212c399e1d94188a5b239a4b9ea8a228ce0
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Mon Mar 5 09:43:51 2012 +0100

    4.8.1
    
    - Drop upstreamed patches

 .gitignore                             |    1 +
 kdelibs-4.7.3-CVE-0046.patch           |   16 ----------------
 kdelibs-4.8.0-kde_version_string.patch |   12 ------------
 kdelibs.spec                           |   18 +++++++-----------
 sources                                |    2 +-
 5 files changed, 9 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db85517..d2eccb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdelibs-4.6.5.tar.bz2
 /kdelibs-4.7.4.tar.bz2
 /kdelibs-4.8.0.tar.bz2
+/kdelibs-4.8.1.tar.xz
diff --git a/kdelibs.spec b/kdelibs.spec
index b7bbcae..fafe70b 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -19,8 +19,8 @@
 %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 
 Summary: KDE Libraries
-Version: 4.8.0
-Release: 5%{?dist}
+Version: 4.8.1
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -38,7 +38,7 @@ Group:   System Environment/Libraries
 %else
 %global stable stable
 %endif
-Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde4-macros(api) >= 2
@@ -129,18 +129,12 @@ Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
 # add s390/s390x support in kjs
 Patch53: kdelibs-4.7.2-kjs-s390.patch
 
-## upstream
-Patch100: kdelibs-4.8.0-kde_version_string.patch
 # don't set rpath on multiarch dirs,  https://git.reviewboard.kde.org/r/103422
 Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
-# CVE-2010-0046, The Cascading Style Sheets (CSS) implementation in khtml/WebKit
-# allows remote attackers to execute arbitrary code or cause a denial of service
-# (memory corruption and application crash) via crafted format arguments.
-Patch201: kdelibs-4.7.3-CVE-0046.patch
 
 ## Fedora specific patches
 # make forcefully hal-free build
@@ -326,12 +320,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch53 -p1 -b .kjs-s390
 
 # upstream patches
-%patch100 -p1 -b .kde_version_string
 %patch101 -p1 -b .cmake_cxx_implicit_link_directories
 
 # security fixes
 %patch200 -p1 -b .CVE-2009-2702
-%patch201 -p1 -b .CVE-2010-0046
 
 # Fedora patches
 %patch300 -p1 -b .halectomy
@@ -580,6 +572,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 05 2012 Radek Novacek <rnovacek at redhat.com> 6:4.8.1-1
+- 4.8.1
+- Drop upstreamed patches
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.8.0-5
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 3258d3b..cf73ffe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c19858c68f9a209ae521d7fb3c34747b  kdelibs-4.8.0.tar.bz2
+0488ec7d753c3455876d9e3f76406292  kdelibs-4.8.1.tar.xz