[packages/gnome-packagekit] - updated to 3.32.0 - updated systemd-fallback patch

qboosh qboosh at pld-linux.org
Sun Dec 1 11:47:07 CET 2019 

commit 8e9d60367e730113411f0e71696f10238cdd90ba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 1 11:47:32 2019 +0100

    - updated to 3.32.0
    - updated systemd-fallback patch

 gnome-packagekit.spec  | 61 +++++++++++++++++---------------------------------
 systemd-fallback.patch | 39 ++++++++++++++++----------------
 2 files changed, 41 insertions(+), 59 deletions(-)
---
diff --git a/gnome-packagekit.spec b/gnome-packagekit.spec
index 5d5ea6b..18ad8c7 100644
--- a/gnome-packagekit.spec
+++ b/gnome-packagekit.spec
@@ -1,3 +1,4 @@
+# TODO: is polkit-gnome still required?
 #
 # Conditional build:
 %bcond_without	systemd	# rely on systemd for session tracking instead of ConsoleKit
@@ -5,42 +6,34 @@
 Summary:	GNOME PackageKit Client
 Summary(pl.UTF-8):	Klient PackageKit dla GNOME
 Name:		gnome-packagekit
-Version:	3.24.0
+Version:	3.32.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.24/%{name}-%{version}.tar.xz
-# Source0-md5:	fb460341360b91977eeba35c8e38d3ba
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.32/%{name}-%{version}.tar.xz
+# Source0-md5:	47d7ce6f90107b2166dcd5c8a8445998
 Patch0:		systemd-fallback.patch
-URL:		http://www.packagekit.org/
+URL:		https://gitlab.gnome.org/GNOME/gnome-packagekit
 BuildRequires:	PackageKit-devel >= 0.9.1
-BuildRequires:	appstream-glib-devel
-BuildRequires:	autoconf >= 2.65
-BuildRequires:	automake >= 1.11
+BuildRequires:	appstream-glib
 BuildRequires:	dbus-devel >= 1.2.0
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	docbook-utils
-BuildRequires:	fontconfig-devel
 BuildRequires:	gettext-tools >= 0.19.7
 BuildRequires:	glib2-devel >= 1:2.32.0
-BuildRequires:	gnome-common
 BuildRequires:	gtk+3-devel >= 3.15.3
-BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libcanberra-devel >= 0.10
-BuildRequires:	libcanberra-gtk3-devel >= 0.10
-BuildRequires:	libnotify-devel >= 0.7.0
-BuildRequires:	libtool >= 2:2
 BuildRequires:	libxslt-progs
+BuildRequires:	meson >= 0.46.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.736
 %{?with_systemd:BuildRequires:  systemd-devel}
-BuildRequires:	udev-glib-devel
-BuildRequires:	upower-devel >= 0.9.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
@@ -63,30 +56,22 @@ narzędzi stworzonych do instalacji, aktualizacji i usuwania pakietów.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .orig
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	%{__enable_disable systemd systemd} \
-	--disable-schemas-compile
+%meson build \
+	%{!?with_systemd:-Dsystemd=false}
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %py_postclean
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS MAINTAINERS README
 %attr(755,root,root) %{_bindir}/gpk-application
 %attr(755,root,root) %{_bindir}/gpk-log
 %attr(755,root,root) %{_bindir}/gpk-prefs
@@ -113,18 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-packagekit
 %{_datadir}/metainfo/org.gnome.PackageUpdater.appdata.xml
 %{_datadir}/metainfo/org.gnome.Packages.appdata.xml
-%{_iconsdir}/hicolor/*x*/apps/gpk-*.png
-# terminating "*" is a workaround for rpm glob failing to glob dirs with symlinks dead at build time
-%{_iconsdir}/hicolor/*x*/mimetypes/application-x-catalog.png*
-%{_iconsdir}/hicolor/*x*/mimetypes/application-x-package-list.png*
-%{_iconsdir}/hicolor/scalable/apps/gpk-*.svg
-%{_iconsdir}/hicolor/scalable/mimetypes/application-x-catalog.svg
-%{_iconsdir}/hicolor/scalable/mimetypes/application-x-package-list.svg
 %{_desktopdir}/gpk-install-local-file.desktop
 %{_desktopdir}/gpk-log.desktop
 %{_desktopdir}/gpk-prefs.desktop
 %{_desktopdir}/org.gnome.PackageUpdater.desktop
 %{_desktopdir}/org.gnome.Packages.desktop
+%{_iconsdir}/hicolor/scalable/apps/gpk-*.svg
+%{_iconsdir}/hicolor/scalable/mimetypes/application-x-catalog.svg
+%{_iconsdir}/hicolor/scalable/mimetypes/application-x-package-list.svg
 %{_mandir}/man1/gpk-application.1*
 %{_mandir}/man1/gpk-log.1*
 %{_mandir}/man1/gpk-prefs.1*
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 8eaaca9..4e47f9b 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -1,25 +1,26 @@
---- gnome-packagekit-3.24.0/configure.ac.orig	2017-06-02 20:22:27.252302717 +0200
-+++ gnome-packagekit-3.24.0/configure.ac	2017-06-02 20:45:14.838953769 +0200
-@@ -129,7 +129,7 @@
-               [with_systemd=auto])
+--- 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')
+   systemd = dependency('libsystemd')
+   polkit = dependency('polkit-gobject-1')
++  dbusglib = dependency('dbus-glib-1')
+ endif
  
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd polkit-gobject-1],
-+                  [libsystemd polkit-gobject-1 dbus-glib-1],
-                   [have_systemd=yes], [have_systemd=no])
+ add_project_arguments('-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE',
+--- gnome-packagekit-3.32.0/src/meson.build.orig	2019-03-08 13:10:25.000000000 +0100
++++ gnome-packagekit-3.32.0/src/meson.build	2019-12-01 11:21:36.049186104 +0100
+@@ -112,8 +112,8 @@
+ ]
  
- AC_MSG_CHECKING([whether to use systemd])
---- gnome-packagekit-3.24.0/src/Makefile.am.orig	2017-06-02 20:45:59.025619930 +0200
-+++ gnome-packagekit-3.24.0/src/Makefile.am	2017-06-02 20:51:32.112282791 +0200
-@@ -42,6 +42,8 @@
- 	gpk-common.h					\
- 	gpk-task.c					\
- 	gpk-task.h					\
-+	egg-console-kit.c				\
-+	egg-console-kit.h				\
- 	gpk-error.c					\
- 	gpk-error.h
+ if get_option('systemd')
+-  gpk_update_viewer_srcs += 'systemd-proxy.c'
+-  gpk_update_viewer_deps += [systemd, polkit]
++  gpk_update_viewer_srcs += ['systemd-proxy.c', 'egg-console-kit.c']
++  gpk_update_viewer_deps += [systemd, polkit, dbusglib]
+ 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
 @@ -30,8 +30,10 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-packagekit.git/commitdiff/8e9d60367e730113411f0e71696f10238cdd90ba

More information about the pld-cvs-commit mailing list