From 4bffb1b46331d1636d05eedd65bebea5134b5828 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Feb 2018 15:49:34 -0600 Subject: [PATCH] BR: gcc-c++, use %ldconfig_scriptlets 1.0.1 --- .gitignore | 3 +- ...fix-build-against-packagekit-offline.patch | 33 ------------------- PackageKit-Qt.spec | 19 ++++++----- sources | 2 +- 4 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 PackageKit-Qt-fix-build-against-packagekit-offline.patch diff --git a/.gitignore b/.gitignore index 915c7f0..14f7e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/v0.10.0.tar.gz -/PackageKit-Qt-1.0.0.tar.gz +/v1.0.1.tar.gz diff --git a/PackageKit-Qt-fix-build-against-packagekit-offline.patch b/PackageKit-Qt-fix-build-against-packagekit-offline.patch deleted file mode 100644 index 9b792bd..0000000 --- a/PackageKit-Qt-fix-build-against-packagekit-offline.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 42605067fd4a400dc1dcf969388c0fe6721ff7fd Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Sat, 13 Jan 2018 00:47:42 +0100 -Subject: Fix build against PackageKit::Offline - -Offline.h doesn't exist. -Offline class wasn't exported - -diff --git a/src/Offline b/src/Offline -index 62d0e71..d19ee9e 100644 ---- a/src/Offline -+++ b/src/Offline -@@ -1 +1 @@ --#include "Offline.h" -+#include "offline.h" -diff --git a/src/offline.h b/src/offline.h -index 6c16256..d6d3755 100644 ---- a/src/offline.h -+++ b/src/offline.h -@@ -24,10 +24,12 @@ - #include - #include - -+#include -+ - namespace PackageKit { - - class OfflinePrivate; --class Offline : public QObject -+class PACKAGEKITQT_LIBRARY Offline : public QObject - { - Q_OBJECT - Q_DECLARE_PRIVATE(Offline) diff --git a/PackageKit-Qt.spec b/PackageKit-Qt.spec index 328e400..6869d20 100644 --- a/PackageKit-Qt.spec +++ b/PackageKit-Qt.spec @@ -1,20 +1,20 @@ Summary: Qt support library for PackageKit Name: PackageKit-Qt -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.packagekit.org/ -Source0: https://github.com/hughsie/PackageKit-Qt/archive/PackageKit-Qt-%{version}.tar.gz +Source0: https://github.com/hughsie/PackageKit-Qt/archive/v%{version}.tar.gz # Upstream patches -Patch0: PackageKit-Qt-fix-build-against-packagekit-offline.patch BuildRequires: cmake BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Sql) +BuildRequires: gcc-c++ # required for /usr/share/dbus-1/interfaces/*.xml BuildRequires: PackageKit >= 0.9.1 @@ -45,8 +45,8 @@ Requires: PackageKit-Qt5%{?_isa} = %{version}-%{release} %build -mkdir -p %{_target_platform} -pushd %{_target_platform} +mkdir %{_target_platform} +pushd %{_target_platform} %{cmake} .. popd @@ -57,8 +57,7 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%post -n PackageKit-Qt5 -p /sbin/ldconfig -%postun -n PackageKit-Qt5 -p /sbin/ldconfig +%ldconfig_scriptlets -n PackageKit-Qt5 %files -n PackageKit-Qt5 %doc AUTHORS NEWS @@ -75,6 +74,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Feb 20 2018 Rex Dieter - 1.0.1-1 +- BR: gcc-c++, use %%ldconfig_scriptlets +- 1.0.1 + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 48eb577..72b3e6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PackageKit-Qt-1.0.0.tar.gz) = 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4 +SHA512 (v1.0.1.tar.gz) = e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a