From 206571ae25f14e3711b80ef4942c5c37976aeb7b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 3 Sep 2012 22:28:41 +0200 Subject: [PATCH] 4.9.1 --- kdelibs-4.8.3-kdeclarative-install-location.patch | 13 ------------- kdelibs.spec | 10 +++++----- sources | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 kdelibs-4.8.3-kdeclarative-install-location.patch diff --git a/kdelibs-4.8.3-kdeclarative-install-location.patch b/kdelibs-4.8.3-kdeclarative-install-location.patch deleted file mode 100644 index ace5462..0000000 --- a/kdelibs-4.8.3-kdeclarative-install-location.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt.kdeclarative-install-location kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt ---- kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt.kdeclarative-install-location 2012-04-29 22:37:35.777207066 +0200 -+++ kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt 2012-04-30 12:20:40.384393056 +0200 -@@ -6,6 +6,9 @@ endif(KDE_PLATFORM_FEATURE_BINARY_COMPAT - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdeclarative.h) - -+set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '64')") -+set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) -+ - include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} diff --git a/kdelibs.spec b/kdelibs.spec index ff12839..5c53e1d 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.9.0 -Release: 4%{?dist} +Version: 4.9.1 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -148,8 +148,6 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch Patch55: kdelibs-4.9.0-udisks_detatch_external_hdd.patch ## upstream -# fix kdeclarative install location (by wstephenson as found in kde-packager list) -Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -331,7 +329,6 @@ popd %patch55 -p1 -b .solid-detach-external-hdd # upstream patches -%patch100 -p1 -b .kdeclarative-install-location # security fixes %patch200 -p1 -b .CVE-2009-2702 @@ -587,6 +584,9 @@ rm -rf %{buildroot} %changelog +* Mon Sep 03 2012 Than Ngo - 6:4.9.1-1 +- 4.9.1 + * Wed Aug 29 2012 Rex Dieter 6:4.9.0-4 - Can't safely remove a USB removable hard drive (#852196) diff --git a/sources b/sources index 2befc24..66b4652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -976adc970ad685661494ae17784c2111 kdelibs-4.9.0.tar.xz +d20b95b594a0df518f270dda0331f88c kdelibs-4.9.1.tar.xz