rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix files and location for kdeclarative

This commit is contained in:
Jaroslav Reznik 2012-04-30 12:34:47 +02:00
parent dc4ed5b61b
commit 6bbcaeb229
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kdelibs-4.8.3-kdeclarative-install-location.patch Normal file
View File

@ -0,0 +1,13 @@
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}

4
kdelibs.spec
View File

@ -142,6 +142,8 @@ Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
Patch53: kdelibs-4.7.2-kjs-s390.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
@ -571,6 +573,7 @@ rm -rf %{buildroot}
%{_kde4_bindir}/kde4-doxygen.sh
%{_kde4_appsdir}/cmake/
%{_kde4_includedir}/*
%{_kde4_libdir}/cmake/KDeclarative/
%{_kde4_libdir}/kde4/devel/
%if 0%{?apidocs}
@ -591,6 +594,7 @@ rm -rf %{buildroot}
- 4.8.3
- remove cmake implicit link directories patch
- remove adblock filter patch
- add kdeclarative install location patch
* Mon Apr 16 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.2-4
- enable udisks2, +Requires: udisks2 on f18+ too