[kdelibs] 4.8.3

Jaroslav Reznik jreznik at fedoraproject.org
Mon Apr 30 08:02:28 UTC 2012


commit dc4ed5b61b86e62e02fd09f0cbd60ad5dd8fb7f7
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Apr 30 10:01:59 2012 +0200

    4.8.3
    
    - remove cmake implicit link directories patch
    - remove adblock filter patch

 .gitignore                                         |    2 +-
 ...4.8.0-cmake_cxx_implicit_link_directories.patch |   22 ----
 kdelibs-4.8.2-filter.patch                         |  123 --------------------
 kdelibs.spec                                       |   17 ++--
 sources                                            |    2 +-
 5 files changed, 10 insertions(+), 156 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf0c94f..9824d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /kdelibs-4.6.5.tar.bz2
-/kdelibs-4.8.2.tar.xz
+/kdelibs-4.8.3.tar.xz
diff --git a/kdelibs.spec b/kdelibs.spec
index 6a97bc5..60736dc 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -24,8 +24,8 @@
 %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 
 Summary: KDE Libraries
-Version: 4.8.2
-Release: 4%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -141,11 +141,7 @@ Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
 # add s390/s390x support in kjs
 Patch53: kdelibs-4.7.2-kjs-s390.patch
 
-## upstream 
-# 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
-# Load/Update filter lists only when AdBlock is enabled
-Patch102: kdelibs-4.8.2-filter.patch
+## upstream
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -340,8 +336,6 @@ popd
 %patch53 -p1 -b .kjs-s390
 
 # upstream patches
-%patch101 -p1 -b .cmake_cxx_implicit_link_directories
-%patch102 -p1 -b .filter
 
 # security fixes
 %patch200 -p1 -b .CVE-2009-2702
@@ -593,6 +587,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 6:4.8.3-1
+- 4.8.3
+- remove cmake implicit link directories patch
+- remove adblock filter patch
+
 * Mon Apr 16 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.8.2-4
 - enable udisks2, +Requires: udisks2 on f18+ too
 
diff --git a/sources b/sources
index 8d77428..8cc8f31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9dc9a76a785045642fb3098692618d2  kdelibs-4.8.2.tar.xz
+c4987c838164bd9ee2787e77243fe4a9  kdelibs-4.8.3.tar.xz


More information about the scm-commits mailing list