From 7eb6bde07d37bb305de818e8d40aa724db8b9f25 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Apr 2014 16:54:11 -0500 Subject: [PATCH] fresh git snapshot --- .gitignore | 5 +--- PackageKit-Qt.spec | 17 +++++------ packagekit-qt-add-missing-config-file.patch | 32 --------------------- sources | 2 +- 4 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 packagekit-qt-add-missing-config-file.patch diff --git a/.gitignore b/.gitignore index caee3e6..f066731 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -/PackageKit-Qt-0.8.6.tar.gz -/PackageKit-Qt-0.8.7.tar.xz /PackageKit-Qt-0.8.8.tar.xz -/QPACKAGEKIT_0_8_9.tar.gz -/master.tar.gz +/2cc27ea5478e841afd66ef44a7c15022872dd291.tar.gz diff --git a/PackageKit-Qt.spec b/PackageKit-Qt.spec index 9234228..c794963 100644 --- a/PackageKit-Qt.spec +++ b/PackageKit-Qt.spec @@ -1,9 +1,10 @@ -%global gitTag master +%global gitTag 2cc27ea5478e841afd66ef44a7c15022872dd291 +%global gitshort 2cc27ea5 Summary: Qt support library for PackageKit Name: PackageKit-Qt Version: 0.9.0 -Release: 0.1.20140408git%{?dist} +Release: 0.2.20140421git%{gitshort}%{?dist} License: LGPLv2+ URL: http://www.packagekit.org/ @@ -12,8 +13,6 @@ URL: http://www.packagekit.org/ # of specific commits or tags Source0: https://gitorious.org/packagekit/packagekit-qt/archive/%{gitTag}.tar.gz -Patch0: packagekit-qt-add-missing-config-file.patch - BuildRequires: cmake BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) @@ -22,7 +21,7 @@ Provides: PackageKit-qt = %{version}-%{release} Provides: PackageKit-qt%{?_isa} = %{version}-%{release} # required for /usr/share/dbus-1/interfaces/*.xml -BuildRequires: PackageKit +BuildRequires: PackageKit >= 0.9.1 %description PackageKit-qt is a Qt support library for PackageKit @@ -41,13 +40,12 @@ Development headers and libraries for PackageKit-Qt. %prep %setup -q -n packagekit-packagekit-qt -%patch0 -p1 -b .cmake-config %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ .. popd @@ -76,7 +74,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog -* Tue Apr 08 2014 Daniel Vrátil - 0.9.0-1 +* Tue Apr 22 2014 Rex Dieter 0.9.0-0.1.20140421git +- fresh git snapshot + +* Tue Apr 08 2014 Daniel Vrátil - 0.9.0-0.1 - Update to 0.9.0 git snapshot, 0.8.x does not build against PackageKit 0.9.0 which is in rawhide * Tue Apr 08 2014 Daniel Vrátil - 0.8.9-1 diff --git a/packagekit-qt-add-missing-config-file.patch b/packagekit-qt-add-missing-config-file.patch deleted file mode 100644 index 502e937..0000000 --- a/packagekit-qt-add-missing-config-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt -index e643a71..0b84840 100755 ---- a/src/modules/CMakeLists.txt -+++ b/src/modules/CMakeLists.txt -@@ -4,7 +4,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}-config.cmake - @ONLY - ) --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packagekit-qt-config-version.cmake.in -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}-config-version.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}-config-version.cmake - @ONLY - ) -diff --git a/src/modules/packagekitqt4-config-version.cmake.in b/src/modules/packagekitqt4-config-version.cmake.in -new file mode 100644 -index 0000000..860eb70 ---- /dev/null -+++ b/src/modules/packagekitqt4-config-version.cmake.in -@@ -0,0 +1,13 @@ -+SET(PACKAGE_VERSION @VERSION@) -+IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_EXACT "true") -+ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) -+IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_COMPATIBLE "true") -+ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_UNSUITABLE "true") -+ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) -+IF (PACKAGE_VERSION_UNSUITABLE) -+ MESSAGE("VERSION CHECK FAILED FOR ${PACKAGE_FIND_NAME}. WANTED ${PACKAGE_FIND_VERSION}, HAVE ${PACKAGE_VERSION}") -+ENDIF(PACKAGE_VERSION_UNSUITABLE) -+ diff --git a/sources b/sources index 500f05e..d2afe71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b82491744a84b6e0dcfe3a163ef441c9 master.tar.gz +117b5bca55d92fde065efde5f5ac8e6c 2cc27ea5478e841afd66ef44a7c15022872dd291.tar.gz