.PackageKit.metadata

@@ -1 +1 @@
-4516c8954e4daf46a3e7e1003e8105d549884d2f SOURCES/PackageKit-1.2.4.tar.xz
+c205f7299520ab19ccd08276ec13fc7e273fb3c3 SOURCES/PackageKit-1.1.12.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/PackageKit-1.2.4.tar.xz
+SOURCES/PackageKit-1.1.12.tar.xz

SOURCES/0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch

@@ -0,0 +1,25 @@
+From bb5d77c89eb0f98e7a76b7cdf14cfe9e79d387fa Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 25 Nov 2019 11:49:06 +0000
+Subject: [PATCH] command-not-found: Don't use a bash regex to fix other shells
+
+---
+ contrib/command-not-found/PackageKit.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/command-not-found/PackageKit.sh.in b/contrib/command-not-found/PackageKit.sh.in
+index ea90981f7..1e1fcdffd 100644
+--- a/contrib/command-not-found/PackageKit.sh.in
++++ b/contrib/command-not-found/PackageKit.sh.in
+@@ -11,7 +11,7 @@ command_not_found_handle () {
+ 	local retval=127
+ 
+ 	# only search for the command if we're interactive
+-	[[ $- =~ i ]] || runcnf=0
++	[[ $- == *"i"* ]] || runcnf=0
+ 
+ 	# don't run if DBus isn't running
+ 	[[ ! -S /run/dbus/system_bus_socket ]] && runcnf=0
+-- 
+2.23.0
+

SOURCES/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch

@@ -0,0 +1,45 @@
+From be075445cafd370abf1ad3e6e85f2baebef056cb Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Wed, 30 Jan 2019 15:37:21 +0100
+Subject: [PATCH] dnf: Don't override DnfContext's release_ver for the running
+ system
+
+Only override release_ver for the system upgrade DnfContext and leave it
+at the default value for the default context. This makes
+dnf_context_setup() automatically figure out the release_ver based on
+the running system: it looks at various provides in rpmdb and finally
+falls back to VERSION_ID from /etc/os-release.
+
+The goal here is to make it possible to adjust the value that gets
+passed to librepo by changing system-release(releasever) provides in
+fedora-release (which DnfContext correctly handles if we leave the
+release_ver set to the default value).
+
+https://pagure.io/releng/issue/7445
+---
+ backends/dnf/pk-backend-dnf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c
+index 47e565915..779896c2d 100644
+--- a/backends/dnf/pk-backend-dnf.c
++++ b/backends/dnf/pk-backend-dnf.c
+@@ -156,7 +156,6 @@ pk_backend_setup_dnf_context (DnfContext *context, GKeyFile *conf, const gchar *
+ 	dnf_context_set_repo_dir (context, repo_dir);
+ 	lock_dir = g_build_filename (destdir, "/var/run", NULL);
+ 	dnf_context_set_lock_dir (context, lock_dir);
+-	dnf_context_set_release_ver (context, release_ver);
+ 	dnf_context_set_rpm_verbosity (context, "info");
+ 
+ 	/* use this initial data if repos are not present */
+@@ -3401,6 +3400,7 @@ pk_backend_upgrade_system_thread (PkBackendJob *job, GVariant *params, gpointer
+ 		g_autoptr(DnfContext) context = NULL;
+ 
+ 		context = dnf_context_new ();
++		dnf_context_set_release_ver (context, release_ver);
+ 		ret = pk_backend_setup_dnf_context (context, priv->conf, release_ver, &error);
+ 		if (!ret) {
+ 			g_debug ("failed to setup context: %s", error->message);
+-- 
+2.21.0
+

SOURCES/0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch

@@ -0,0 +1,38 @@
+From cdbd27d699b51e37c533d07abd2f1ab26e11355c Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 18 Dec 2018 01:02:27 +0100
+Subject: [PATCH] dnf: Invalidate the sack cache after downloading new metadata
+
+This fixes first resolve() after refresh() to correctly return the new
+data.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1642878
+---
+ backends/dnf/pk-backend-dnf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c
+index 5961f1258..47e565915 100644
+--- a/backends/dnf/pk-backend-dnf.c
++++ b/backends/dnf/pk-backend-dnf.c
+@@ -1568,6 +1568,7 @@ pk_backend_refresh_cache_thread (PkBackendJob *job,
+ 				 gpointer user_data)
+ {
+ 	PkBackendDnfJobData *job_data = pk_backend_job_get_user_data (job);
++	PkBackend *backend = pk_backend_job_get_backend (job);
+ 	DnfRepo *repo;
+ 	DnfState *state_local;
+ 	DnfState *state_loop;
+@@ -1699,6 +1700,9 @@ pk_backend_refresh_cache_thread (PkBackendJob *job,
+ 		return;
+ 	}
+ 
++	/* invalidate the sack cache after downloading new metadata */
++	pk_backend_sack_cache_invalidate (backend, "downloaded new metadata");
++
+ 	/* regenerate the libsolv metadata */
+ 	state_local = dnf_state_get_child (job_data->state);
+ 	sack = dnf_utils_create_sack_for_filters (job, 0,
+-- 
+2.19.1
+

SOURCES/0001-pk-transaction-Only-set-polkit-interactive-flag-if-t.patch

@@ -0,0 +1,56 @@
+From 0a46c047512e36d454800602b3845be35eb2dafe Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Sat, 1 May 2021 01:08:59 +0100
+Subject: [PATCH 1/2] pk-transaction: Only set polkit interactive flag if
+ transaction has too
+
+This should fix polkit dialogues popping up when doing background
+refresh operations, particularly for the
+`org.freedesktop.packagekit.system-sources-refresh` action.
+
+See
+https://gitlab.gnome.org/GNOME/gnome-software/-/issues/582#note_1095101.
+
+Note: This fix is only done through code inspection. I have not tried to
+reproduce the failure case, and not tested that this commit actually
+fixes it.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ src/pk-transaction.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/pk-transaction.c b/src/pk-transaction.c
+index 83ee5588c..64b7def40 100644
+--- a/src/pk-transaction.c
++++ b/src/pk-transaction.c
+@@ -2252,6 +2252,7 @@ pk_transaction_authorize_actions (PkTransaction *transaction,
+ 	PkTransactionPrivate *priv = transaction->priv;
+ 	const gchar *text = NULL;
+ 	struct AuthorizeActionsData *data = NULL;
++	PolkitCheckAuthorizationFlags flags;
+ 
+ 	if (actions->len <= 0) {
+ 		g_debug ("No authentication required");
+@@ -2338,13 +2339,17 @@ pk_transaction_authorize_actions (PkTransaction *transaction,
+ 	data->role = role;
+ 	data->actions = g_ptr_array_ref (actions);
+ 
++	flags = POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE;
++	if (pk_backend_job_get_interactive (priv->job))
++		flags |= POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION;
++
+ 	g_debug ("authorizing action %s", action_id);
+ 	/* do authorization async */
+ 	polkit_authority_check_authorization (priv->authority,
+ 					      priv->subject,
+ 					      action_id,
+ 					      details,
+-					      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++					      flags,
+ 					      priv->cancellable,
+ 					      (GAsyncReadyCallback) pk_transaction_authorize_actions_finished_cb,
+ 					      data);
+-- 
+2.40.0
+

SOURCES/0002-pk-engine-Only-set-polkit-interactive-flag-if-method.patch

@@ -0,0 +1,84 @@
+From b06fae505b66049e537ad15d3569c260e9bc976f Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Sat, 1 May 2021 01:16:05 +0100
+Subject: [PATCH 2/2] pk-engine: Only set polkit interactive flag if method
+ call has too
+
+Same as the previous commit.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ src/pk-engine.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/pk-engine.c b/src/pk-engine.c
+index 7ea87a448..3d6633ba6 100644
+--- a/src/pk-engine.c
++++ b/src/pk-engine.c
+@@ -632,6 +632,18 @@ pk_engine_is_proxy_unchanged (PkEngine *engine, const gchar *sender,
+ 	return TRUE;
+ }
+ 
++static PolkitCheckAuthorizationFlags
++get_polkit_flags_for_dbus_invocation (GDBusMethodInvocation *invocation)
++{
++	PolkitCheckAuthorizationFlags flags = POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE;
++	GDBusMessage *message = g_dbus_method_invocation_get_message (invocation);
++
++	if (g_dbus_message_get_flags (message) & G_DBUS_MESSAGE_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION)
++		flags |= POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION;
++
++	return flags;
++}
++
+ static void
+ pk_engine_set_proxy (PkEngine *engine,
+ 		     const gchar *proxy_http,
+@@ -715,7 +727,7 @@ pk_engine_set_proxy (PkEngine *engine,
+ 	polkit_authority_check_authorization (engine->priv->authority, subject,
+ 					      "org.freedesktop.packagekit.system-network-proxy-configure",
+ 					      NULL,
+-					      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++					      get_polkit_flags_for_dbus_invocation (context),
+ 					      NULL,
+ 					      (GAsyncReadyCallback) pk_engine_action_obtain_proxy_authorization_finished_cb,
+ 					      state);
+@@ -1604,7 +1616,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
+ 		polkit_authority_check_authorization (engine->priv->authority, subject,
+ 						      "org.freedesktop.packagekit.trigger-offline-update",
+ 						      NULL,
+-						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++						      get_polkit_flags_for_dbus_invocation (invocation),
+ 						      NULL,
+ 						      pk_engine_offline_helper_cb,
+ 						      helper);
+@@ -1618,7 +1630,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
+ 		polkit_authority_check_authorization (engine->priv->authority, subject,
+ 						      "org.freedesktop.packagekit.clear-offline-update",
+ 						      NULL,
+-						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++						      get_polkit_flags_for_dbus_invocation (invocation),
+ 						      NULL,
+ 						      pk_engine_offline_helper_cb,
+ 						      helper);
+@@ -1645,7 +1657,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
+ 		polkit_authority_check_authorization (engine->priv->authority, subject,
+ 						      "org.freedesktop.packagekit.trigger-offline-update",
+ 						      NULL,
+-						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++						      get_polkit_flags_for_dbus_invocation (invocation),
+ 						      NULL,
+ 						      pk_engine_offline_helper_cb,
+ 						      helper);
+@@ -1672,7 +1684,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
+ 		polkit_authority_check_authorization (engine->priv->authority, subject,
+ 						      "org.freedesktop.packagekit.trigger-offline-upgrade",
+ 						      NULL,
+-						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++						      get_polkit_flags_for_dbus_invocation (invocation),
+ 						      NULL,
+ 						      pk_engine_offline_helper_cb,
+ 						      helper);
+-- 
+2.40.0
+

SOURCES/revert-shutdown-on-idle.patch

@@ -0,0 +1,41 @@
+From c9c13747e575fe2ce398cec200284d0318aaece3 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Wed, 29 Apr 2020 13:44:41 -0500
+Subject: [PATCH] Revert "Shutdown the daemon on idle by default"
+
+This reverts commit 0c84d71509e851db20445c747529bd7d3724f081.
+
+This broke the end session dialog in GNOME Shell.
+
+I thought I had that fixed by changing GNOME Shell to autostart
+PackageKit when it is not already running:
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1104
+
+But turns out, there are more problems. The update fails if the user has
+used dnf since PackageKit last quit, a scenario I did not test. It also
+results in GNOME Software getting confused about what software is
+installed and what software is not. The issues are discussed here:
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1227#note_784327
+
+It's still desirable to shut down automatically, but it requires more
+planning. And shutting down GNOME Software itself is frankly more
+important, since it uses a lot more RAM than packagekitd.
+---
+ src/pk-main.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/pk-main.c b/src/pk-main.c
+index 7a0bbd199..5791c5fef 100644
+--- a/src/pk-main.c
++++ b/src/pk-main.c
+@@ -178,8 +178,6 @@ main (int argc, char *argv[])
+ 
+ 	/* after how long do we timeout? */
+ 	exit_idle_time = g_key_file_get_integer (conf, "Daemon", "ShutdownTimeout", NULL);
+-	if (exit_idle_time == 0)
+-		exit_idle_time = 300;
+ 	g_debug ("daemon shutdown set to %i seconds", exit_idle_time);
+ 
+ 	/* override the backend name */

SPECS/PackageKit.spec

@@ -1,45 +1,91 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
+%global gitdate 20161221
+%global bundled_libdnf 0
+
 %global glib2_version 2.54.0
-%global libdnf_version 0.43.1
+%global libdnf_version 0.22.0
+
+%if 0%{?bundled_libdnf}
+%global commit1 fe5a08bca7e2599798af7778917da2cc31f1460e
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+%endif
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   1.2.4
+Version:   1.1.12
-Release:   2%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
 
-%if 0%{?fedora}
+%if 0%{?bundled_libdnf}
-Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
+# https://github.com/rpm-software-management/libdnf
-%elif 0%{?rhel}
+# Bundled because the library is API/ABI unstable, and we're trying to
-Patch0:    PackageKit-0.3.8-RHEL-Vendor.conf.patch
+# avoid being version locked with rpm-ostree/dnf right now.
+Source1: https://github.com/rpm-software-management/libdnf/archive/%{commit1}/libdnf-%{shortcommit1}.tar.gz
+Provides: bundled(libdnf) = 0.7.0
 %endif
 
+# RHEL-specific: set Vendor.conf up for RHEL.
+Patch0:    rhel-Vendor.conf.patch
+
+# Backported from upstream
+Patch1:    0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch
+Patch2:    0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch
+Patch3:    0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch
+Patch5:    0001-pk-transaction-Only-set-polkit-interactive-flag-if-t.patch
+Patch6:    0002-pk-engine-Only-set-polkit-interactive-flag-if-method.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1814820
+Patch4:    revert-shutdown-on-idle.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
 BuildRequires: gtk-doc
 BuildRequires: sqlite-devel
 BuildRequires: polkit-devel >= 0.92
+BuildRequires: libtool
+BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: docbook-utils
-BuildRequires: meson
+BuildRequires: yelp-tools
+BuildRequires: intltool
 BuildRequires: gettext
-BuildRequires: vala
+BuildRequires: vala-tools
 BuildRequires: gstreamer1-devel
 BuildRequires: gstreamer1-plugins-base-devel
 BuildRequires: pango-devel
 BuildRequires: fontconfig-devel
 BuildRequires: libappstream-glib-devel
+%if 0%{?bundled_libdnf}
+BuildRequires: check-devel
+BuildRequires: cmake
+BuildRequires: librepo-devel
+BuildRequires: libsolv-devel
+BuildRequires: python2-devel
+BuildRequires: python2-nose
+BuildRequires: python2-sphinx
+BuildRequires: rpm-devel
+%else
 BuildRequires: libdnf-devel >= %{libdnf_version}
+%endif
 BuildRequires: systemd-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: bash-completion
+BuildRequires: python3-devel
+
+%if 0%{?bundled_libdnf}
+# Filter private libraries
+%global __provides_exclude ^libdnf[.]so[.].*$
+%global __requires_exclude ^libdnf[.]so[.].*$
+%endif
 
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Requires: glib2%{?_isa} >= %{glib2_version}
+%if ! 0%{?bundled_libdnf}
 Requires: libdnf%{?_isa} >= %{libdnf_version}
+%endif
 Requires: shared-mime-info
 Requires: systemd
 
@@ -56,6 +102,12 @@ Obsoletes: PackageKit-yum < 0.9.1
 Obsoletes: PackageKit-yum-plugin < 0.9.1
 Obsoletes: PackageKit-zif < 0.8.13-2
 
+# Removed in F23
+Obsoletes: PackageKit-cached-metadata < 1.0.10-2
+
+# Removed in F24
+Obsoletes: PackageKit-browser-plugin < 1.0.11-3
+
 # components now built-in
 Obsoletes: PackageKit-debug-install < 0.9.1
 Obsoletes: PackageKit-hawkey < 0.9.1
@@ -64,6 +116,14 @@ Obsoletes: PackageKit-backend-devel < 0.9.6
 # Udev no longer provides this functionality
 Obsoletes: PackageKit-device-rebind < 0.8.13-2
 
+# remove F22
+Provides: PackageKit-debug-install = %{version}-%{release}
+Provides: PackageKit-device-rebind = %{version}-%{release}
+Provides: PackageKit-hawkey = %{version}-%{release}
+Provides: PackageKit-yum = %{version}-%{release}
+Provides: PackageKit-yum-plugin = %{version}-%{release}
+Provides: PackageKit-zif = %{version}-%{release}
+
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
 to manage packages in a secure way using a cross-distro,
@@ -132,31 +192,69 @@ using PackageKit.
 %prep
 %autosetup -p1
 
+%if 0%{?bundled_libdnf}
+# Extract libdnf archive
+tar -xf %{S:1}
+%endif
+
 %build
-%meson \
+%if 0%{?bundled_libdnf}
-        -Dgtk_doc=true \
+mkdir -p libdnf-%{commit1}/build
-        -Dpython_backend=false \
+pushd libdnf-%{commit1}/build
-        -Dpackaging_backend=dnf \
+%cmake \
-        -Dlocal_checkout=false
+  -DCMAKE_BUILD_TYPE=Release \
-%meson_build
+  ..
+%make_build
+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 \
+        --enable-dnf \
+        --enable-introspection \
+        --enable-bash-completion \
+        --disable-local \
+        --disable-silent-rules
+
+make %{?_smp_mflags} V=1
 
 %install
-%meson_install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%if 0%{?bundled_libdnf}
+# Install libdnf to a temporary prefix
+make install DESTDIR=`pwd`/libdnf-install -C libdnf-%{commit1}/build
+# Cherry pick the shared library
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/PackageKit
+cp -a libdnf-install%{_libdir}/libdnf*.so.* $RPM_BUILD_ROOT%{_libdir}/PackageKit
+%endif
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/libpackagekit-action-lookup.la
 
 # Create directories for downloaded appstream data
-mkdir -p %{buildroot}%{_localstatedir}/cache/app-info/{icons,xmls}
+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 %{buildroot}%{_libexecdir} > /dev/null
+pushd ${RPM_BUILD_ROOT}%{_libexecdir} > /dev/null
 ln -s pk-gstreamer-install gst-install-plugins-helper
 popd > /dev/null
 
-# enable packagekit-offline-updates.service here for now, till we
+# create a link that from the comps icons to PK, as PackageKit frontends
-# decide how to do it upstream after the meson conversion:
+# cannot add /usr/share/pixmaps/comps to the icon search path as some distros
-# https://github.com/hughsie/PackageKit/issues/401
+# do not use comps. Patching this in the frontend is not a good idea, as there
-# https://bugzilla.redhat.com/show_bug.cgi?id=1833176
+# are multiple frontends in multiple programming languages.
-mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/
+pushd ${RPM_BUILD_ROOT}%{_datadir}/PackageKit > /dev/null
-ln -sf ../packagekit-offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants/packagekit-offline-update.service
+ln -s ../pixmaps/comps icons
+popd > /dev/null
 
 %find_lang %name
 
@@ -169,22 +267,27 @@ 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
 %{_datadir}/bash-completion/completions/pkcon
 %dir %{_libdir}/packagekit-backend
 %config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
 %config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
-%{_datadir}/man/man1/pkcon.1*
+%dir %{_datadir}/PackageKit/helpers/test_spawn
-%{_datadir}/man/man1/pkmon.1*
+%{_datadir}/PackageKit/icons
+%{_datadir}/PackageKit/helpers/test_spawn/*
+%{_datadir}/man/man1/pkcon.1.gz
+%{_datadir}/man/man1/pkmon.1.gz
 %{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/polkit-1/rules.d/*
 %{_datadir}/PackageKit/pk-upgrade-distro.sh
-%{_datadir}/PackageKit/helpers/test_spawn/search-name.sh
 %{_libexecdir}/packagekitd
 %{_libexecdir}/packagekit-direct
 %{_bindir}/pkmon
@@ -192,7 +295,10 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %exclude %{_libdir}/libpackagekit*.so.*
 %{_libdir}/packagekit-backend/libpk_backend_dummy.so
 %{_libdir}/packagekit-backend/libpk_backend_test_*.so
-%ghost %verify(not md5 size mtime) %attr(0644,-,-) %{_localstatedir}/lib/PackageKit/transactions.db
+%if 0%{?bundled_libdnf}
+%{_libdir}/PackageKit/
+%endif
+%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
 %{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_unitdir}/packagekit-offline-update.service
@@ -214,6 +320,7 @@ 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
 
@@ -231,154 +338,52 @@ 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 Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.4-2
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.1.12-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
 
-* Mon Aug 09 2021 Milan Crha <mcrha@redhat.com> - 1.2.4-1
+* Mon Apr 24 2023 Richard Hughes <rhughes@redhat.com> - 1.1.12-7
-- New upstream release
+- Backport changes for passing interactive flag to polkit calls.
-- Add specific error code when user declined interaction
+- Resolves: #2177711
-- Avoid spurious GObject::notify signal emissions
-- Fix a leak on calling set_locale() a second time
-- Fix a possible use-after-free under pk_client_cancel_cb()
-- Honor install_weak_deps=False
-- Improve thread safety on an operation cancellation
-- Let the finish understand the 'cancelled' exit code
-- Only set polkit interactive flag if method call has too
-- Read update information also when getting list of updates
-- Use 'hy_query_get_advisory_pkgs', if available
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Mar 22 2021 Richard Hughes <rhughes@redhat.com> - 1.2.3-1
-- New upstream release
-- Add support for coercing upgrade to distupgrade
-- Append to cron log instead of overwriting it
-- Cancel a transaction if calling Cancel fails or the daemon disappears
-- Remove large transaction size sanity check
 
-* Mon Mar 08 2021 Richard Hughes <rhughes@redhat.com> - 1.2.2-5
+* Fri May 22 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 1.1.12-6
-- Drop unused gnome-doc-utils BR
+- Fix documentation links in Vendor.conf
+- Resolves: #1837648
 
-* Tue Feb 09 2021 Kalev Lember <klember@redhat.com> - 1.2.2-4
+* Tue May 19 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 1.1.12-5
-- Fix multilib conflicts in generated pk-enum-types.h (#1915259)
+- Do not shutdown the daemon on idle
+- Resolves: #1814820
 
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-3
+* Mon Nov 25 2019 Richard Hughes <rhughes@redhat.com> - 1.1.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Do not use a bash regex to fix CNF on shells other than bash
+- Resolves: #1728855
 
-* Mon Nov  9 2020 Vít Ondruch <vondruch@redhat.com> - 1.2.2-2
+* Wed May 29 2019 Kalev Lember <klember@redhat.com> - 1.1.12-3
-- Fix crash on login.
+- Backport a patch to improve release_ver handling (#1714439)
-  Resolves: rhbz#1836304
-
-* Mon Nov 02 2020 Richard Hughes <rhughes@redhat.com> - 1.2.2-1
-- New upstream release
-- Notify systemd when beginning to shutdown
-- Fix possible information disclosure
-
-* Mon Sep 07 2020 Richard Hughes <rhughes@redhat.com> - 1.2.1-1
-- New upstream release
-- Actually merge in the PolicyKit translation
-- Exit pkcon with retval 5 if no packages needed be installed
-- Fix command-not-found handling arguments with spaces
-- Fix setting libexecdir for command-not-found helper
-- Use SQL statements for queries with input
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri May 08 2020 Adam Williamson <awilliam@redhat.com> - 1.2.0-3
-- Fix packagekit-offline-update.service not being enabled (#1833176)
-
-* Tue May 05 2020 Neal Gompa <ngompa13@gmail.com> - 1.2.0-2
-- Clean up and simplify spec
-- Fix packaging to work properly with EL8+
-
-* 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
-
-* Wed Jan 08 2020 Richard Hughes <rhughes@redhat.com> - 1.1.13-1
-- New upstream release
-- Don't use a bash regex to fix command not found on other shells
-- Keep a ref on transaction while doing async polkit call
-- Properly mark obsoleted packages when simulating upgrade
-- Return directly when its state is going backwards
-- Shrink the progress bar to fit when run in small spaces
-- Support non-x86 arches in gstreamer helper
-- zsh command not found should return the same as its bash equivalent
-
-* Tue Aug 13 2019 Richard Hughes <rhughes@redhat.com> - 1.1.12-12
-- Fix rpmdb permission of transaction database file
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.12-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 19 2019 Richard Hughes <rhughes@redhat.com> - 1.1.12-10
-- Do not trigger an inotity event when the AppStream XML data is unchanged
-- Remove the unconditional copy to speed up gnome-software startup.
-
-* Fri Jul 12 2019 Kalev Lember <klember@redhat.com> - 1.1.12-9
-- Drop unused comps-extras requires
-
-* Wed Jun 19 2019 Kalev Lember <klember@redhat.com> - 1.1.12-8
-- Don't override DnfContext's release_ver for the running system
-
-* Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.12-7
-- Rebuild for RPM 4.15
-
-* Mon Jun 10 15:42:04 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.12-6
-- Rebuild for RPM 4.15
-
-* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 1.1.12-5
-- Use new plymouth "system-upgrade" and "reboot" modes
-
-* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.1.12-4
-- Update BRs for vala packaging changes
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
 * Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 1.1.12-2
-- Invalidate the sack cache after downloading new metadata (#1642878)
+- Invalidate the sack cache after downloading new metadata
 
 * Wed Nov 28 2018 Kalev Lember <klember@redhat.com> - 1.1.12-1
 - Update to 1.1.12
 
-* Tue Sep 25 2018 Richard Hughes <rhughes@redhat.com> - 1.1.11-1
+* Wed Oct 24 2018 Richard Hughes <rhughes@redhat.com> - 1.1.10-6
-- New upstream release
+- Backport a patch to fix modularity.
-- Add --autoremove option to pkcon
+- Resolves: #1641091
-- De-register callbacks on PkClientHelper finalize
-- Don't complain if command-not-found get uninstalled while running
-- Never assert when an interactive TTY is not available
-- Shut down services cleanly before rebooting after offline updates
-- Shutdown the daemon on idle by default
 
-* Sat Sep 22 2018 Adam Williamson <awilliam@redhat.com> - 1.1.10-5
+* Tue Oct 09 2018 Richard Hughes <rhughes@redhat.com> - 1.1.10-5
-- Backport several more fixes from master for libdnf compat
+- Backport a patch to poke subscription manager when required
+- Resolves: #1633244
 
-* Tue Jul 24 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.1.10-4
+* Thu Jul 12 2018 Richard Hughes <rhughes@redhat.com> - 1.1.10-4
-- Add patch to support modularity
+- Enable the DNF backend
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.10-3
+* Wed Jul 11 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.1.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Replace gnome-doc-utils with yelp-tools for the docs
 
-* Tue Jun 26 2018 Adam Williamson <awilliam@redhat.com> - 1.1.10-2
+* Thu Jun 14 2018 Richard Hughes <rhughes@redhat.com> - 1.1.10-2
-- Rebuild for new libdnf
+- Don't depend on a dead package for gnome-packagekit
 
 * Mon Apr 23 2018 Richard Hughes <rhughes@redhat.com> - 1.1.10-1
 - New upstream release