From 7b5ccf5452d4868c9ad168bd9b302c2637132641b2597a175df016e9a9aefb33 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 26 Oct 2020 08:12:50 +0000 Subject: [PATCH] Accepting request 842922 from GNOME:Next update to 3.38.1 - TW should be ready OBS-URL: https://build.opensuse.org/request/show/842922 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=187 --- gnome-software-3.36.1.tar.xz | 3 -- gnome-software-3.38.0.tar.xz | 3 ++ gnome-software-add-missing-headers.patch | 23 ------------- gnome-software-no-static-lib.patch | 15 +++++++++ gnome-software.changes | 43 ++++++++++++++++++++++++ gnome-software.spec | 30 ++++++++++++++--- 6 files changed, 86 insertions(+), 31 deletions(-) delete mode 100644 gnome-software-3.36.1.tar.xz create mode 100644 gnome-software-3.38.0.tar.xz delete mode 100644 gnome-software-add-missing-headers.patch create mode 100644 gnome-software-no-static-lib.patch diff --git a/gnome-software-3.36.1.tar.xz b/gnome-software-3.36.1.tar.xz deleted file mode 100644 index 9fa48a7..0000000 --- a/gnome-software-3.36.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d4d66c70780539f204f96088da4fcb02371b0a8147f9266ce632ca784bf6f6e -size 8277796 diff --git a/gnome-software-3.38.0.tar.xz b/gnome-software-3.38.0.tar.xz new file mode 100644 index 0000000..9efb153 --- /dev/null +++ b/gnome-software-3.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:878acb12a214f7d52796cd6462a3e1954696f2660de7b06b8acfd8b70d225566 +size 8349796 diff --git a/gnome-software-add-missing-headers.patch b/gnome-software-add-missing-headers.patch deleted file mode 100644 index 4cd5a68..0000000 --- a/gnome-software-add-missing-headers.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: gnome-software-3.36.1/lib/meson.build -=================================================================== ---- gnome-software-3.36.1.orig/lib/meson.build -+++ gnome-software-3.36.1/lib/meson.build -@@ -38,12 +38,18 @@ configure_file( - install_headers([ - 'gnome-software.h', - 'gs-app.h', -+ 'gs-app-collation.h', - 'gs-app-list.h', -+ 'gs-autocleanups.h', - 'gs-category.h', -+ 'gs-ioprio.h', - 'gs-metered.h', - 'gs-os-release.h', - 'gs-plugin.h', - 'gs-plugin-event.h', -+ 'gs-plugin-job.h', -+ 'gs-plugin-loader.h', -+ 'gs-plugin-loader-sync.h', - 'gs-plugin-types.h', - 'gs-plugin-vfuncs.h', - 'gs-utils.h' diff --git a/gnome-software-no-static-lib.patch b/gnome-software-no-static-lib.patch new file mode 100644 index 0000000..3f67f72 --- /dev/null +++ b/gnome-software-no-static-lib.patch @@ -0,0 +1,15 @@ +Index: gnome-software-3.37.92/lib/meson.build +=================================================================== +--- gnome-software-3.37.92.orig/lib/meson.build ++++ gnome-software-3.37.92/lib/meson.build +@@ -45,8 +45,8 @@ if get_option('polkit') + librarydeps += polkit + endif + +-libgnomesoftware = static_library( +- 'gnomesoftware', ++libgnomesoftware = shared_library( ++ 'gnomesoftware-'+meson.project_version(), + sources : [ + 'gs-app.c', + 'gs-app-list.c', diff --git a/gnome-software.changes b/gnome-software.changes index 45f01ab..7121065 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Tue Oct 20 13:40:22 UTC 2020 - Dominique Leuenberger + +- Enable parental control integration (deps are now packaged): + + Add pkgconfig(malcontent-0) BuildRequires. + + Replace -Dmalcontent=false meson parameter with + -Dmalcontent=true. + +------------------------------------------------------------------- +Fri Sep 11 17:36:49 UTC 2020 - dimstar@opensuse.org + +- Update to version 3.38.0: + + Updated translations. +- Bump define _version to 3_38_0 (soversion) following upstream + changes. + +------------------------------------------------------------------- +Fri Sep 4 16:18:52 UTC 2020 - dimstar@opensuse.org + +- Update to version 3.37.92: + + Add sysprof support for profiling jobs. + + Add webflow and basic auth support to flatpak plugin. + + Coalesce refresh operations where possible. + + Correctly mark layered rpm-ostree local packages as removable. + + Fix flatpak bundle installation. + + Handle invalid snap auth data. + + Improve flatpak progress reporting for transactions. + + Improve the heuristic for detecting old-style AppStream + override files. + + Many performance improvements in many areas of the code. + + Only delete the firmware archive if we downloaded it to the + cache. + + Show a pulsing progress bar if progress is unknown. + + Support loading appstream files from custom install prefix. + + Use the runtime fwupd version for the user agent. + + Updated translations. +- Drop gnome-software-add-missing-headers.patch: fixed upstream. +- Add pkgconfig(sysprof-4) and pkgconfig(sysprof-capture-4) + BuildRequires: new dependency. +- Add gnome-software-no-static-lib.patch: do not install a static + library. +- Split out library package libgnomesoftware-3_37_92. + ------------------------------------------------------------------- Wed Aug 5 06:28:46 UTC 2020 - Yifan Jiang diff --git a/gnome-software.spec b/gnome-software.spec index 368779d..528707d 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -17,22 +17,23 @@ %define gs_plugin_api 13 +%define _version 3_38_0 Name: gnome-software -Version: 3.36.1 +Version: 3.38.0 Release: 0 Summary: GNOME Software Store License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/Software -Source0: https://download.gnome.org/sources/gnome-software/3.36/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-software/3.38/%{name}-%{version}.tar.xz %if 0%{?sle_version} # PATCH-FIX-OPENSUSE gnome-software-launch-gpk-update-viewer-for-updates.patch bsc#1077332 boo#1090042 sckang@suse.com -- Don't launch gnome-software when clicking the updates notification. Launch gpk-update-viewer instead. Patch0: gnome-software-launch-gpk-update-viewer-for-updates.patch %endif # PATCH-FIX-UPSTREAM gnome-software-failed-offline-update-notification.patch bsc#1161095 glgo#GNOME/gnome-software!471 sckang@suse.com -- plugin-loader: handle offline update errors properly. Patch1: gnome-software-failed-offline-update-notification.patch -# PATCH-FIX-UPSTREAM gnome-software-add-missing-headers.patch bsc#1174849 erico.mendonca@suse.com -- Add missing devel header files. -Patch2: gnome-software-add-missing-headers.patch +# PATCH-FIX-OPENSUSE gnome-software-no-static-lib.patch dimstar@opensuse.org -- convert libgnomesoftware.a to a shared lib +Patch2: gnome-software-no-static-lib.patch BuildRequires: gtk-doc BuildRequires: meson >= 0.47.0 @@ -53,10 +54,13 @@ BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.0 BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) >= 2.52.0 +BuildRequires: pkgconfig(malcontent-0) >= 0.3.0 BuildRequires: pkgconfig(ostree-1) BuildRequires: pkgconfig(packagekit-glib2) >= 1.1.0 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(sysprof-4) +BuildRequires: pkgconfig(sysprof-capture-4) BuildRequires: pkgconfig(xmlb) >= 0.1.7 # boo#1090042 Requires: fwupd @@ -67,10 +71,20 @@ Recommends: flatpak %description AppStore like management of Applications for your GNOME Desktop. +%package -n libgnomesoftware-%{_version} +Summary: Library to access GNOME Software catalog +Group: System/GUI/GNOME + +%description -n libgnomesoftware-%{_version} +AppStore like management of Applications for your GNOME Desktop. + +This library is not considered ABI/API stable + %package devel Summary: Development files for the GNOME software store Group: Development/Libraries/GNOME Requires: %{name} = %{version} +Requires: libgnomesoftware-%{_version} = %{version} %description devel This subpackage contains the header files for developing @@ -85,7 +99,7 @@ GNOME software store plugins. %meson \ -Dtests=false \ -Dvalgrind=false \ - -Dmalcontent=false \ + -Dmalcontent=true \ %{nil} %meson_build @@ -96,6 +110,9 @@ GNOME software store plugins. # Remove any piece of doc that ends up in non-standard locations and use the doc macro instead rm %{buildroot}%{_datadir}/doc/%{name}/README.md +%post -n libgnomesoftware-%{_version} -p /sbin/ldconfig +%postun -n libgnomesoftware-%{_version} -p /sbin/ldconfig + %files %license COPYING %doc NEWS README.md @@ -126,6 +143,9 @@ rm %{buildroot}%{_datadir}/doc/%{name}/README.md %{_mandir}/man1/%{name}.1%{?ext_man} %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop +%files -n libgnomesoftware-%{_version} +%{_libdir}/libgnomesoftware-%{version}.so + %files devel %doc AUTHORS MAINTAINERS %dir %{_includedir}/%{name}