From 61dd45ba567c69f3bc4c269c06545a3559cb3a85 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 12 Jan 2018 08:58:54 -0600 Subject: [PATCH] 0.10.0 --- .gitignore | 2 +- ...use-of-QLoggingCategory-packagekitqt.patch | 92 ------------------- 0003-Fix-copy-n-paste-typo.patch | 25 ----- PackageKit-Qt.spec | 87 ++++-------------- sources | 2 +- 5 files changed, 20 insertions(+), 188 deletions(-) delete mode 100644 0002-Make-use-of-QLoggingCategory-packagekitqt.patch delete mode 100644 0003-Fix-copy-n-paste-typo.patch diff --git a/.gitignore b/.gitignore index 427ab9a..05db5f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/PackageKit-Qt-0.9.5.tar.xz +/v0.10.0.tar.gz diff --git a/0002-Make-use-of-QLoggingCategory-packagekitqt.patch b/0002-Make-use-of-QLoggingCategory-packagekitqt.patch deleted file mode 100644 index 2bfb620..0000000 --- a/0002-Make-use-of-QLoggingCategory-packagekitqt.patch +++ /dev/null @@ -1,92 +0,0 @@ -From a71ce8e2065393a3dcf4cbcbd50a95732783c93e Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Mon, 4 May 2015 18:55:08 -0300 -Subject: [PATCH 2/3] Make use of QLoggingCategory packagekitqt - ---- - src/common.h | 4 ++++ - src/daemon.cpp | 2 ++ - src/daemonprivate.cpp | 2 +- - src/transaction.cpp | 4 +++- - src/transactionprivate.cpp | 2 +- - 5 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/common.h b/src/common.h -index 05a3df4..24b7894 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -17,6 +17,10 @@ - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ -+#include -+ -+Q_DECLARE_LOGGING_CATEGORY(PACKAGEKITQT_TRANSACTION) -+Q_DECLARE_LOGGING_CATEGORY(PACKAGEKITQT_DAEMON) - - #define PK_NAME "org.freedesktop.PackageKit" - #define PK_PATH "/org/freedesktop/PackageKit" -diff --git a/src/daemon.cpp b/src/daemon.cpp -index 647756a..138a13a 100755 ---- a/src/daemon.cpp -+++ b/src/daemon.cpp -@@ -26,6 +26,8 @@ - - #include "common.h" - -+Q_LOGGING_CATEGORY(PACKAGEKITQT_TRANSACTION, "packagekitqt.daemon") -+ - using namespace PackageKit; - - Daemon* Daemon::m_global = 0; -diff --git a/src/daemonprivate.cpp b/src/daemonprivate.cpp -index 25ba55b..15e5362 100644 ---- a/src/daemonprivate.cpp -+++ b/src/daemonprivate.cpp -@@ -143,7 +143,7 @@ void DaemonPrivate::updateProperties(const QVariantMap &properties) - } else if (property == QLatin1String("VersionMinor")) { - versionMinor = value.toUInt(); - } else { -- qWarning() << "Unknown Transaction property:" << property << value; -+ qCWarning(PACKAGEKITQT_DAEMON) << "Unknown Daemon property:" << property << value; - } - - ++it; -diff --git a/src/transaction.cpp b/src/transaction.cpp -index 7cfa302..96d946b 100755 ---- a/src/transaction.cpp -+++ b/src/transaction.cpp -@@ -28,6 +28,8 @@ - - #include - -+Q_LOGGING_CATEGORY(PACKAGEKITQT_TRANSACTION, "packagekitqt.transaction") -+ - using namespace PackageKit; - - Transaction::Transaction() -@@ -353,7 +355,7 @@ Transaction::InternalError Transaction::parseError(const QString &errorName) - return Transaction::InternalErrorFunctionNotSupported; - } - -- qWarning() << "Transaction::parseError: unknown error" << errorName; -+ qCWarning(PACKAGEKITQT_TRANSACTION) << "Transaction::parseError: unknown error" << errorName; - return Transaction::InternalErrorFailed; - } - -diff --git a/src/transactionprivate.cpp b/src/transactionprivate.cpp -index 2c73899..56bc218 100644 ---- a/src/transactionprivate.cpp -+++ b/src/transactionprivate.cpp -@@ -335,7 +335,7 @@ void TransactionPrivate::updateProperties(const QVariantMap &properties) - uid = value.toUInt(); - QMetaObject::invokeMethod(q, "uidChanged", Qt::QueuedConnection); - } else { -- qWarning() << "Unknown Transaction property:" << property << value; -+ qCWarning(PACKAGEKITQT_TRANSACTION) << "Unknown Transaction property:" << property << value; - } - - ++it; --- -2.5.0 - diff --git a/0003-Fix-copy-n-paste-typo.patch b/0003-Fix-copy-n-paste-typo.patch deleted file mode 100644 index c0215b8..0000000 --- a/0003-Fix-copy-n-paste-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1d4dc83d34cd4284fad7df5b259edbd4ef48d54a Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Mon, 4 May 2015 19:03:11 -0300 -Subject: [PATCH 3/3] Fix copy'n'paste typo - ---- - src/daemon.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon.cpp b/src/daemon.cpp -index 138a13a..98d5c97 100755 ---- a/src/daemon.cpp -+++ b/src/daemon.cpp -@@ -26,7 +26,7 @@ - - #include "common.h" - --Q_LOGGING_CATEGORY(PACKAGEKITQT_TRANSACTION, "packagekitqt.daemon") -+Q_LOGGING_CATEGORY(PACKAGEKITQT_DAEMON, "packagekitqt.daemon") - - using namespace PackageKit; - --- -2.5.0 - diff --git a/PackageKit-Qt.spec b/PackageKit-Qt.spec index 996e8db..cc55019 100644 --- a/PackageKit-Qt.spec +++ b/PackageKit-Qt.spec @@ -1,52 +1,31 @@ -#global gitTag 396cb8e4ed03ef9352e0e0e8ff941355df877405 -#global gitshort 396cb8e4 - -%global qt5 1 Summary: Qt support library for PackageKit Name: PackageKit-Qt -Version: 0.9.5 -Release: 9%{?dist} +Version: 0.10.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.packagekit.org/ -%if 0%{?gitTag:1} -# Gitorious does not provide final tarballs, but allows downloading gzipp'ed snapshots -# of specific commits or tags -Source0: https://gitorious.org/packagekit/packagekit-qt/archive/%{gitTag}.tar.gz -%else -Source0: http://www.freedesktop.org/software/PackageKit/releases/PackageKit-Qt-%{version}.tar.xz -%endif - -## upstream patches -# These are Qt5-specific, breaks Qt4 build -#Patch2: 0002-Make-use-of-QLoggingCategory-packagekitqt.patch -#Patch3: 0003-Fix-copy-n-paste-typo.patch +Source0: https://github.com/hughsie/PackageKit-Qt/archive/v%{version}.tar.gz BuildRequires: cmake -BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Sql) # required for /usr/share/dbus-1/interfaces/*.xml BuildRequires: PackageKit >= 0.9.1 -Obsoletes: PackageKit-qt < 0.8.6 - Recommends: PackageKit +## FIXME/TODO: +# Qt4-based PackageKit-Qt no longer supported or built since 0.10.0 release, add Obsoletes somewhere? +# consider renaming PackageKit-Qt5 -> PackageKit-Qt ? -- rex + %description PackageKit-Qt is a Qt support library for PackageKit -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: PackageKit-qt-devel < 0.8.6 -%description devel -%{summary}. - -%if 0%{?qt5} %package -n PackageKit-Qt5 Summary: Qt5 support library for PackageKit -BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Sql) Recommends: PackageKit %description -n PackageKit-Qt5 %{summary}. @@ -56,60 +35,28 @@ Summary: Development files for PackageKit-Qt5 Requires: PackageKit-Qt5%{?_isa} = %{version}-%{release} %description -n PackageKit-Qt5-devel %{summary}. -%endif %prep -%autosetup -p1 %{?gitTag:-n packagekit-packagekit-qt} +%autosetup -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ - -DUSE_QT5:BOOL=OFF \ - .. +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} .. popd make %{?_smp_mflags} -C %{_target_platform} -%if 0%{?qt5} -mkdir -p %{_target_platform}-qt5 -pushd %{_target_platform}-qt5 -%{cmake} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ - -DUSE_QT5:BOOL=ON \ - .. -popd - -make %{?_smp_mflags} -C %{_target_platform}-qt5 -%endif %install -%if 0%{?qt5} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 -%endif make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%doc AUTHORS NEWS -%license COPYING -%{_libdir}/libpackagekitqt4.so.%{version} -%{_libdir}/libpackagekitqt4.so.0 +%post -n PackageKit-Qt5 -p /sbin/ldconfig +%postun -n PackageKit-Qt5 -p /sbin/ldconfig -%files devel -%{_libdir}/libpackagekitqt4.so -%{_libdir}/pkgconfig/packagekitqt4.pc -%{_includedir}/packagekitqt4/ -%dir %{_libdir}/cmake -%{_libdir}/cmake/packagekitqt4/ - -%if 0%{?qt5} %files -n PackageKit-Qt5 %doc AUTHORS NEWS %license COPYING @@ -122,10 +69,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_includedir}/packagekitqt5/ %dir %{_libdir}/cmake %{_libdir}/cmake/packagekitqt5/ -%endif %changelog +* Fri Jan 12 2018 Rex Dieter - 0.10.0-1 +- 0.10.0 + * Wed Aug 02 2017 Fedora Release Engineering - 0.9.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 96193e7..aad37fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -520448ff32aaf338c1ac5f97690d6691 PackageKit-Qt-0.9.5.tar.xz +SHA512 (v0.10.0.tar.gz) = acd07d7c6e4eef9d8c9e2e639583122bda69de0b3ce08c0965c19cf2371a6ccaf98f6995d8adc44a28c96175bd52946796de114094faab829db2849998674748