- updated to 43.0

diff --git a/gnome-packagekit.spec b/gnome-packagekit.spec
index 18ad8c797cd5f9b14a163f2df245b61cc896da6b..115304dfaad342037acb182682c1132027dae374 100644 (file)
--- a/gnome-packagekit.spec
+++ b/gnome-packagekit.spec
@@ -6,23 +6,23 @@
 Summary:       GNOME PackageKit Client
 Summary(pl.UTF-8):     Klient PackageKit dla GNOME
 Name:          gnome-packagekit
-Version:       3.32.0
+Version:       43.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.32/%{name}-%{version}.tar.xz
-# Source0-md5: 47d7ce6f90107b2166dcd5c8a8445998
+Source0:       https://download.gnome.org/sources/gnome-packagekit/43/%{name}-%{version}.tar.xz
+# Source0-md5: cc7fa625c449df6f75bda2abab95ea0d
 Patch0:                systemd-fallback.patch
 URL:           https://gitlab.gnome.org/GNOME/gnome-packagekit
+BuildRequires: AppStream
 BuildRequires: PackageKit-devel >= 0.9.1
-BuildRequires: appstream-glib
 BuildRequires: dbus-devel >= 1.2.0
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd41-sgml
 BuildRequires: docbook-utils
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.32.0
-BuildRequires: gtk+3-devel >= 3.15.3
+BuildRequires: glib2-devel >= 1:2.56.0
+BuildRequires: gtk+3-devel >= 3.24
 BuildRequires: libxslt-progs
 BuildRequires: meson >= 0.46.0
 BuildRequires: ninja >= 1.5
@@ -38,10 +38,10 @@ BuildRequires:      yelp-tools
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
-Requires(post,preun):  glib2 >= 1:2.32.0
+Requires(post,preun):  glib2 >= 1:2.56.0
 Requires:      PackageKit >= 0.9.1
-Requires:      glib2 >= 1:2.32.0
-Requires:      gtk+3 >= 3.15.3
+Requires:      glib2 >= 1:2.56.0
+Requires:      gtk+3 >= 3.24
 Requires:      polkit-gnome >= 0.92
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS README
+%doc AUTHORS COMMITMENT MAINTAINERS README.md
 %attr(755,root,root) %{_bindir}/gpk-application
 %attr(755,root,root) %{_bindir}/gpk-log
 %attr(755,root,root) %{_bindir}/gpk-prefs
@@ -96,9 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
 %{_datadir}/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
 %{_datadir}/gnome-packagekit
-%{_datadir}/metainfo/org.gnome.PackageUpdater.appdata.xml
-%{_datadir}/metainfo/org.gnome.Packages.appdata.xml
-%{_desktopdir}/gpk-install-local-file.desktop
+%{_datadir}/metainfo/org.gnome.PackageUpdater.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Packages.metainfo.xml
 %{_desktopdir}/gpk-log.desktop
 %{_desktopdir}/gpk-prefs.desktop
 %{_desktopdir}/org.gnome.PackageUpdater.desktop

diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 4e47f9b51a083d02b45a72962c151ea2a84116b1..751640111a37b08dcd0e2707f27155e296dc2503 100644 (file)
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -1,8 +1,8 @@
---- gnome-packagekit-3.32.0/meson.build.orig   2019-03-08 13:10:25.000000000 +0100
-+++ gnome-packagekit-3.32.0/meson.build        2019-12-01 11:02:58.011909698 +0100
-@@ -87,6 +87,7 @@
- if get_option('systemd')
+--- gnome-packagekit-43.0/meson.build.orig     2023-05-17 19:57:31.162693696 +0200
++++ gnome-packagekit-43.0/meson.build  2023-05-17 20:10:12.318570160 +0200
+@@ -88,6 +88,7 @@ if get_option('systemd')
    systemd = dependency('libsystemd')
+   conf.set('HAVE_SYSTEMD', 1)
    polkit = dependency('polkit-gobject-1')
 +  dbusglib = dependency('dbus-glib-1')
  endif
@@ -21,8 +21,8 @@
  endif
  
  executable(
---- gnome-packagekit-3.24.0/src/gpk-update-viewer.c.orig       2016-12-06 20:33:18.000000000 +0100
-+++ gnome-packagekit-3.24.0/src/gpk-update-viewer.c    2017-06-02 20:53:20.828948216 +0200
+--- gnome-packagekit-43.0/src/gpk-update-viewer.c.orig 2022-11-04 12:29:10.000000000 +0100
++++ gnome-packagekit-43.0/src/gpk-update-viewer.c      2023-05-17 20:13:40.120777732 +0200
 @@ -30,8 +30,10 @@
  #include <packagekit-glib2/packagekit.h>
  
@@ -57,7 +57,7 @@
        }
  
        /* only show the button if we can do the action */
-@@ -249,12 +253,17 @@ gpk_update_viewer_check_restart (void)
+@@ -249,12 +253,16 @@ gpk_update_viewer_check_restart (void)
        /* do the action */
        if (restart_update == PK_RESTART_ENUM_SYSTEM) {
  #ifdef HAVE_SYSTEMD
@@ -67,16 +67,15 @@
 +#endif
 +                      /* use consolekit to restart */
 +                      ret = egg_console_kit_restart (console, &error);
-+
                if (!ret) {
                        /* TRANSLATORS: the PackageKit request did not complete, and it did not send an error */
                        gpk_update_viewer_error_dialog (_("Could not restart"), NULL, error->message);
                }
 -#endif
-       }
-       return ret;
- }
-@@ -2753,8 +2762,12 @@ gpk_update_viewer_application_startup_cb
+       } else if (restart_update == PK_RESTART_ENUM_SESSION) {
+               g_autoptr(GDBusConnection) bus = NULL;
+               bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+@@ -2746,8 +2754,12 @@ gpk_update_viewer_application_startup_cb
  
        settings = g_settings_new (GPK_SETTINGS_SCHEMA);
  #ifdef HAVE_SYSTEMD
@@ -90,7 +89,7 @@
        cancellable = g_cancellable_new ();
  
        control = pk_control_new ();
-@@ -2980,6 +2993,8 @@ main (int argc, char *argv[])
+@@ -2975,6 +2987,8 @@ main (int argc, char *argv[])
        if (proxy != NULL)
                systemd_proxy_free (proxy);
  #endif