From 5b3d5f76be01f29067c185d0f1929a1a9e5271c5 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 4 May 2020 14:25:03 +0100
Subject: [PATCH] New upstream release

---
 .gitignore      |  1 +
 PackageKit.spec | 45 ++++++++++++++++++++++-----------------------
 sources         |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7894590..cadddc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-1.1.11.tar.xz
 /PackageKit-1.1.12.tar.xz
 /PackageKit-1.1.13.tar.xz
+/PackageKit-1.2.0.tar.xz
diff --git a/PackageKit.spec b/PackageKit.spec
index bfef0e4..b179ff0 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -13,8 +13,8 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   1.1.13
-Release:   2%{?dist}
+Version:   1.2.0
+Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@@ -36,11 +36,11 @@ BuildRequires: gtk-doc
 BuildRequires: sqlite-devel
 BuildRequires: polkit-devel >= 0.92
 BuildRequires: libtool
-BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: docbook-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: intltool
+BuildRequires: meson
 BuildRequires: gettext
 BuildRequires: vala
 BuildRequires: gstreamer1-devel
@@ -201,22 +201,20 @@ popd
 export DNF_CFLAGS="-I`pwd`/libdnf-%{commit1} `pkg-config --cflags appstream-glib`"
 export DNF_LIBS="-L`pwd`/libdnf-%{commit1}/build/libdnf -ldnf -Wl,-rpath=%{_libdir}/PackageKit `pkg-config --libs appstream-glib`"
 %endif
-%configure \
-        --disable-static \
+%meson \
+        -Dgtk_doc=true \
+        -Dpython_backend=false \
 %if 0%{?rhel} == 0
-        --enable-dnf \
-        --enable-introspection \
-        --enable-bash-completion \
+        -Dpackaging_backend=dnf \
+        -Dbash_completion=true \
 %else
-        --disable-bash-completion \
+        -Dbash_completion=false \
 %endif
-        --disable-local \
-        --disable-silent-rules
-
-make %{?_smp_mflags} V=1
+        -Dlocal_checkout=false
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 %if 0%{?bundled_libdnf}
 # Install libdnf to a temporary prefix
@@ -236,8 +234,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/libpackagekit-action-lookup.
 # Create directories for downloaded appstream data
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/app-info/{icons,xmls}
 
-touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite
-
 # create a link that GStreamer will recognise
 pushd ${RPM_BUILD_ROOT}%{_libexecdir} > /dev/null
 ln -s pk-gstreamer-install gst-install-plugins-helper
@@ -254,14 +250,11 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %license COPYING
 %doc README AUTHORS NEWS
 %dir %{_datadir}/PackageKit
-%dir %{_datadir}/PackageKit/helpers
 %dir %{_sysconfdir}/PackageKit
 %dir %{_localstatedir}/lib/PackageKit
 %dir %{_localstatedir}/cache/app-info
 %dir %{_localstatedir}/cache/app-info/icons
 %dir %{_localstatedir}/cache/app-info/xmls
-%dir %{_localstatedir}/cache/PackageKit
-%ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
 %if !0%{?rhel}
 %{_datadir}/bash-completion/completions/pkcon
 %endif
@@ -269,8 +262,6 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
 %config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
-%dir %{_datadir}/PackageKit/helpers/test_spawn
-%{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/man/man1/pkcon.1.gz
 %{_datadir}/man/man1/pkmon.1.gz
 %{_datadir}/polkit-1/actions/*.policy
@@ -291,7 +282,7 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_unitdir}/packagekit-offline-update.service
 %{_unitdir}/packagekit.service
-%{_unitdir}/system-update.target.wants/
+#%{_unitdir}/system-update.target.wants/
 %{_libexecdir}/pk-*offline-update
 %if 0%{?rhel} == 0
 %{_libdir}/packagekit-backend/libpk_backend_dnf.so
@@ -310,7 +301,6 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_libexecdir}/gst-install-plugins-helper
 
 %files gtk3-module
-%{_libdir}/gtk-2.0/modules/*.so
 %{_libdir}/gtk-3.0/modules/*.so
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/*.desktop
 
@@ -328,8 +318,17 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
 %{_datadir}/gtk-doc/html/PackageKit
 %{_datadir}/vala/vapi/packagekit-glib2.vapi
+%{_datadir}/vala/vapi/packagekit-glib2.deps
 
 %changelog
+* Mon May 04 2020 Richard Hughes <rhughes@redhat.com> - 1.2.0-1
+- New upstream release
+- Do not do failable actions in constructors
+- Load all the repos and vars directories
+- Port to the meson build system
+- Remove the GTK2 gtk-module support
+- Revert "Shutdown the daemon on idle by default"
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b72133..01b3bd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PackageKit-1.1.13.tar.xz) = b15f78841c6329ef269824d27a626f8d01c6b77d1fc506b3cc5f80c0ae1477a9c3f292233f64320c1e84aa4b872f08c960afa83e56156a06cedb7f5ec41d0d0c
+SHA512 (PackageKit-1.2.0.tar.xz) = 92ab0194bca6d597585a2ca8c41d79cd04c4ef7eaeed935ea42bf6762bc506916f7fc1a480d4c4040e4fd5b31c0b53d5b13b32215bde3cff7d0ca2d8c260af3a