Hello community, here is the log from the commit of package PackageKit-Qt for openSUSE:Factory checked in at 2013-09-25 17:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit-Qt (Old) and /work/SRC/openSUSE:Factory/.PackageKit-Qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit-Qt" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit-Qt/PackageKit-Qt.changes 2013-05-13 15:10:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-Qt.new/PackageKit-Qt.changes 2013-09-25 17:18:36.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 20 07:57:26 UTC 2013 - [email protected] + +- Add PackageKit-Qt-libdir-references.patch: Fix the installed + packagekit-qt2-config.cmake file to have the correct link to the + library by keeping CMAKE_INSTALL_LIBDIR as a relative path and + the .pc file to have a valid path to $libdir. + +------------------------------------------------------------------- New: ---- PackageKit-Qt-libdir-references.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-Qt.spec ++++++ --- /var/tmp/diff_new_pack.xR8LaJ/_old 2013-09-25 17:18:37.000000000 +0200 +++ /var/tmp/diff_new_pack.xR8LaJ/_new 2013-09-25 17:18:37.000000000 +0200 @@ -24,7 +24,9 @@ Group: System/Daemons Url: http://packagekit.org/ Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz -BuildRequires: PackageKit-devel +# PATCH-FIX-UPSTREAM PackageKit-Qt-libdir-references.patch [email protected] -- Fix lib location written into .cmake and .pc file. +Patch0: PackageKit-Qt-libdir-references.patch +BuildRequires: PackageKit-devel >= %{version} BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libqt4-devel @@ -63,6 +65,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir build ++++++ PackageKit-Qt-libdir-references.patch ++++++ Index: PackageKit-Qt-0.8.8/src/modules/packagekit-qt2-config.cmake.in =================================================================== --- PackageKit-Qt-0.8.8.orig/src/modules/packagekit-qt2-config.cmake.in +++ PackageKit-Qt-0.8.8/src/modules/packagekit-qt2-config.cmake.in @@ -6,6 +6,6 @@ SET(prefix "@CMAKE_INSTALL_PREFIX@") SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") -SET(PACKAGEKIT_QT2_LIBRARIES "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libpackagekit-qt2.so" CACHE FILEPATH "Libraries for PackageKit-Qt2") +SET(PACKAGEKIT_QT2_LIBRARIES "@PK_QT2_INSTALL_LIBDIR@/libpackagekit-qt2.so" CACHE FILEPATH "Libraries for PackageKit-Qt2") SET(PACKAGEKIT_QT2_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PackageKit/packagekit-qt2" CACHE PATH "Include path for PackageKit-Qt2") SET(PACKAGEKIT_QT2_FOUND "TRUE") Index: PackageKit-Qt-0.8.8/src/packagekit-qt2.pc.in =================================================================== --- PackageKit-Qt-0.8.8.orig/src/packagekit-qt2.pc.in +++ PackageKit-Qt-0.8.8/src/packagekit-qt2.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@PK_QT2_INSTALL_LIBDIR@ includedir=${prefix}/include Name: packagekit-qt2 Index: PackageKit-Qt-0.8.8/CMakeLists.txt =================================================================== --- PackageKit-Qt-0.8.8.orig/CMakeLists.txt +++ PackageKit-Qt-0.8.8/CMakeLists.txt @@ -49,6 +49,13 @@ set (LOCALSTATEDIR "/var") add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") set(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") +if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + set (PK_QT2_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) +else (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + set (PK_QT2_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +endif (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + + configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
