Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2019-08-28 16:01:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Wed Aug 28 16:01:10 2019 rev:190 rq:725537 version:1.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2019-08-22 15:04:37.662577916 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new.7948/PackageKit.changes 2019-08-28 16:01:15.498802520 +0200 @@ -1,0 +2,11 @@ +Mon Aug 19 01:10:02 UTC 2019 - Bjørn Lie <[email protected]> + +- Refresh patches with quilt. +- Drop PackageKit-cron-without-sleep.patch: Not needed for any + current version of openSUSE. +- Add PackageKit-drop-gtk2.patch: Port away from gtk2 dependency, + drop gtk2-devel BuildRequires (gh#/hughsie/PackageKit#333). +- Add autoconf-archive BuildRequires and run autogen.sh, needed as + above patch touches buildsystem. + +------------------------------------------------------------------- Old: ---- PackageKit-cron-without-sleep.patch New: ---- PackageKit-drop-gtk2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.tYMUjw/_old 2019-08-28 16:01:16.266802404 +0200 +++ /var/tmp/diff_new_pack.tYMUjw/_new 2019-08-28 16:01:16.270802404 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,6 +27,7 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif + Name: PackageKit Version: 1.1.12 Release: 0 @@ -34,13 +35,12 @@ License: GPL-2.0-or-later Group: System/Daemons URL: https://www.freedesktop.org/software/PackageKit/ -Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz -Source1: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz.asc +Source0: %{url}/releases/%{name}-%{version}.tar.xz +Source1: %{url}/releases/%{name}-%{version}.tar.xz.asc Source2: baselibs.conf Source3: PackageKit.tmpfiles Source99: PackageKit.keyring -# PATCH-FIX-OPENSUSE PackageKit-cron-without-sleep.patch boo#1071521 [email protected] -- Do not sleep in the cron job; our cron mechansim has sufficient randomization -Patch0: PackageKit-cron-without-sleep.patch + # PATCH-FIX-UPSTREAM PackageKit-return-on-transactions-going-backwards.patch gh#hughsie/PackageKit#301, bsc#1038425 [email protected] -- transaction: Return directly when its state is going backwards Patch1: PackageKit-return-on-transactions-going-backwards.patch # PATCH-FIX-UPSTREAM PackageKit-add-mutex-lock-to-protect-backend-priv-eulas.patch gh#hughsie/PackageKit#303, bsc#1038425 [email protected] -- Remove pk_is_thread_default() check in pk_backend_is_eula_valid @@ -55,13 +55,16 @@ Patch7: PackageKit-zypp-fix-newest-filter.patch # PATCH-FIX-UPSTREAM PackageKit-zypp-fix-what-provides-newest-filter.patch bsc#984865, gh#hughsie/PackageKit#335 [email protected] -- zypp: Add support for newest filter in what-provides Patch8: PackageKit-zypp-fix-what-provides-newest-filter.patch +# PATCH-FIX-UPSTREAM PackageKit-drop-gtk2.patch gh#/hughsie/PackageKit#333 - Port away from gtk2 dependency +Patch9: PackageKit-drop-gtk2.patch + +BuildRequires: autoconf-archive BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk-doc -BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libarchive-devel @@ -233,23 +236,11 @@ %lang_package %prep -%setup -q -%if 0%{suse_version} < 1500 -%patch0 -p1 -%endif -%patch1 -p1 -%patch2 -p1 -%if 0%{suse_version} >= 1500 -%patch3 -p1 -%endif -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autosetup -p1 translation-update-upstream %build +NOCONFIGURE=1 ./autogen.sh %if !0%{?is_opensuse} export CFLAGS="%{optflags} -DSLE" %endif @@ -272,7 +263,7 @@ --disable-cron \ %endif %{nil} -make %{?_smp_mflags} +%make_build %install %make_install @@ -444,7 +435,6 @@ %dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop %{_libdir}/gtk-3.0/modules/* -%{_libdir}/gtk-2.0/modules/* %files devel %doc %{_datadir}/gtk-doc/html/PackageKit ++++++ PackageKit-drop-gtk2.patch ++++++ ++++ 917 lines (skipped) ++++++ PackageKit-return-on-transactions-going-backwards.patch ++++++ --- /var/tmp/diff_new_pack.tYMUjw/_old 2019-08-28 16:01:16.318802396 +0200 +++ /var/tmp/diff_new_pack.tYMUjw/_new 2019-08-28 16:01:16.318802396 +0200 @@ -15,11 +15,11 @@ src/pk-transaction.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/pk-transaction.c b/src/pk-transaction.c -index 76e99655f..d14ea7d9c 100644 ---- a/src/pk-transaction.c -+++ b/src/pk-transaction.c -@@ -760,6 +760,7 @@ pk_transaction_set_state (PkTransaction *transaction, PkTransactionState state) +Index: PackageKit-1.1.12/src/pk-transaction.c +=================================================================== +--- PackageKit-1.1.12.orig/src/pk-transaction.c ++++ PackageKit-1.1.12/src/pk-transaction.c +@@ -760,6 +760,7 @@ pk_transaction_set_state (PkTransaction g_warning ("cannot set %s, as already %s", pk_transaction_state_to_string (state), pk_transaction_state_to_string (priv->state)); @@ -27,6 +27,3 @@ } g_debug ("transaction now %s", pk_transaction_state_to_string (state)); --- -2.20.1 - ++++++ PackageKit-zypp-fix-newest-filter.patch ++++++ --- /var/tmp/diff_new_pack.tYMUjw/_old 2019-08-28 16:01:16.330802395 +0200 +++ /var/tmp/diff_new_pack.tYMUjw/_new 2019-08-28 16:01:16.330802395 +0200 @@ -13,11 +13,11 @@ backends/zypp/pk-backend-zypp.cpp | 32 +++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) -diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp -index 13a5c5db1..a8d50593b 100644 ---- a/backends/zypp/pk-backend-zypp.cpp -+++ b/backends/zypp/pk-backend-zypp.cpp -@@ -2895,6 +2895,7 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +Index: PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +=================================================================== +--- PackageKit-1.1.12.orig/backends/zypp/pk-backend-zypp.cpp ++++ PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +@@ -2895,6 +2895,7 @@ backend_resolve_thread (PkBackendJob *jo zypp_get_packages_by_name (search[i], ResKind::pattern, v2); v.insert (v.end (), v2.begin (), v2.end ()); @@ -25,7 +25,7 @@ sat::Solvable newest; vector<sat::Solvable> pkgs; -@@ -2906,7 +2907,11 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +@@ -2906,7 +2907,11 @@ backend_resolve_thread (PkBackendJob *jo if (zypp_filter_solvable (_filters, *it) || zypp_is_no_solvable(*it)) continue; @@ -38,7 +38,7 @@ if (zypp_is_no_solvable(newest)) { newest = *it; } else if (it->edition() > newest.edition() || Arch::compare(it->arch(), newest.arch()) > 0) { -@@ -2915,19 +2920,26 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +@@ -2915,19 +2920,26 @@ backend_resolve_thread (PkBackendJob *jo MIL << "emit " << *it << endl; pkgs.push_back (*it); } @@ -74,6 +74,3 @@ zypp_emit_filtered_packages_in_list (job, _filters, pkgs); } } --- -2.21.0 - ++++++ zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch ++++++ --- /var/tmp/diff_new_pack.tYMUjw/_old 2019-08-28 16:01:16.390802386 +0200 +++ /var/tmp/diff_new_pack.tYMUjw/_new 2019-08-28 16:01:16.390802386 +0200 @@ -8,11 +8,11 @@ backends/zypp/pk-backend-zypp.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp -index 77fc69639..b607d5632 100644 ---- a/backends/zypp/pk-backend-zypp.cpp -+++ b/backends/zypp/pk-backend-zypp.cpp -@@ -3297,6 +3297,14 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us +Index: PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +=================================================================== +--- PackageKit-1.1.12.orig/backends/zypp/pk-backend-zypp.cpp ++++ PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +@@ -3297,6 +3297,14 @@ backend_update_packages_thread (PkBacken ResPool pool = zypp_build_pool (zypp, TRUE); PkRestartEnum restart = PK_RESTART_ENUM_NONE; ++++++ zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch ++++++ --- /var/tmp/diff_new_pack.tYMUjw/_old 2019-08-28 16:01:16.398802384 +0200 +++ /var/tmp/diff_new_pack.tYMUjw/_new 2019-08-28 16:01:16.398802384 +0200 @@ -7,11 +7,11 @@ backends/zypp/pk-backend-zypp.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp -index b607d5632..13a5c5db1 100644 ---- a/backends/zypp/pk-backend-zypp.cpp -+++ b/backends/zypp/pk-backend-zypp.cpp -@@ -1470,7 +1470,7 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo +Index: PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +=================================================================== +--- PackageKit-1.1.12.orig/backends/zypp/pk-backend-zypp.cpp ++++ PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp +@@ -1470,7 +1470,7 @@ zypp_perform_execution (PkBackendJob *jo case INSTALL: case UPDATE: // for updates we only care for updates @@ -20,7 +20,7 @@ continue; break; } -@@ -3305,6 +3305,10 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us +@@ -3305,6 +3305,10 @@ backend_update_packages_thread (PkBacken } } @@ -31,7 +31,7 @@ PoolStatusSaver saver; for (guint i = 0; package_ids[i]; i++) { -@@ -3323,12 +3327,12 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us +@@ -3323,12 +3327,12 @@ backend_update_packages_thread (PkBacken // patches are special - they are not installed and can't have update candidates if (sel->kind() != ResKind::patch) { MIL << "sel " << sel->kind() << " " << sel->ident() << endl;
