This commit is contained in:
Than Ngo 2012-09-03 22:28:41 +02:00
parent 04f815b67d
commit 206571ae25
3 changed files with 6 additions and 19 deletions

View File

@ -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}

View File

@ -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 <than@redhat.com> - 6:4.9.1-1
- 4.9.1
* Wed Aug 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.0-4
- Can't safely remove a USB removable hard drive (#852196)

View File

@ -1 +1 @@
976adc970ad685661494ae17784c2111 kdelibs-4.9.0.tar.xz
d20b95b594a0df518f270dda0331f88c kdelibs-4.9.1.tar.xz