!20 【轻量级 PR】：let BuildRequire valgrind depend on system macro

From: @laokz 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot

0001-crash-with-broken-theme.patch

@@ -1,38 +0,0 @@
-Subject: [PATCH] gs-feature-tile: Do not abort when the theme is broken
-
-Just print a warning when the theme doesn't provide 'theme_fg_color' and
-fallback to black color.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1228
-
-diff -up gnome-software-42.rc/src/gs-feature-tile.c.1 gnome-software-42.rc/src/gs-feature-tile.c
---- gnome-software-42.rc/src/gs-feature-tile.c.1	2022-03-04 16:23:58.566735700 +0100
-+++ gnome-software-42.rc/src/gs-feature-tile.c	2022-03-07 08:06:29.046595524 +0100
-@@ -411,7 +411,6 @@ gs_feature_tile_refresh (GsAppTile *self
- 		if (key_colors != tile->key_colors_cache) {
- 			g_autoptr(GArray) colors = NULL;
- 			GdkRGBA fg_rgba;
--			gboolean fg_rgba_valid;
- 			GsHSBC fg_hsbc;
- 			const GsHSBC *chosen_hsbc;
- 			GsHSBC chosen_hsbc_modified;
-@@ -429,8 +428,17 @@ gs_feature_tile_refresh (GsAppTile *self
- 			 * @min_abs_contrast contrast with the foreground, so
- 			 * that the text is legible.
- 			 */
--			fg_rgba_valid = gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba);
--			g_assert (fg_rgba_valid);
-+			if (!gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba)) {
-+				static gboolean i_know = FALSE;
-+				if (!i_know) {
-+					i_know = TRUE;
-+					g_warning ("The theme doesn't provide 'theme_fg_color', fallbacking to black");
-+				}
-+				fg_rgba.red = 0.0;
-+				fg_rgba.green = 0.0;
-+				fg_rgba.blue = 0.0;
-+				fg_rgba.alpha = 1.0;
-+			}
- 
- 			gtk_rgb_to_hsv (fg_rgba.red, fg_rgba.green, fg_rgba.blue,
- 					&fg_hsbc.hue, &fg_hsbc.saturation, &fg_hsbc.brightness);

gnome-software.spec

@@ -1,29 +1,34 @@
 %global appstream_version 0.14.0
-%global libadwaita_version 1.0.1
-%global libxmlb_version 0.1.7
-%global glib2_version 2.61.1
-%global gtk4_version 4.4.0
-%global json_glib_version 1.2.0
-%global libsoup_version 2.52.0
-%global packagekit_version 1.1.1
-%global fwupd_version 1.3.3
 %global flatpak_version 1.5.1
+%global fwupd_version 1.3.3
+%global glib2_version 2.61.1
+%global gtk4_version 4.9.2
+%global json_glib_version 1.2.0
+%global libadwaita_version 1.3
+%global libxmlb_version 0.1.7
+%global packagekit_version 1.1.1
+
+%define gs_plugin_version 20
+
+%global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$
 
 Name:                gnome-software
-Version:             42.2
+Version:             44.5
-Release:             1
+Release:             2
 Summary:             GNOME software Store
 License:             GPLv2+
 URL:                 https://wiki.gnome.org/Apps/Software
-Source0:             https://download.gnome.org/sources/gnome-software/42/%{name}-%{version}.tar.xz
+Source0:             https://download.gnome.org/sources/gnome-software/44/%{name}-%{version}.tar.xz
-Patch01:             0001-crash-with-broken-theme.patch
 
 BuildRequires:       gettext libxslt docbook-style-xsl desktop-file-utils gtk-doc
 BuildRequires:       gnome-desktop3-devel gspell-devel polkit-devel ostree-devel rpm-ostree-devel
 BuildRequires:       gsettings-desktop-schemas-devel gnome-online-accounts-devel
 BuildRequires:       libappstream-glib-devel >= 0.7.14-3 libdnf-devel libsoup-devel
-BuildRequires:       libgudev1-devel valgrind-devel rpm-devel sysprof-devel
+BuildRequires:       libgudev1-devel rpm-devel sysprof-devel
-BuildRequires:       gcc gcc-c++ meson appstream-devel
+%ifarch %{valgrind_arches}
+BuildRequires:       valgrind-devel
+%endif
+BuildRequires:       gcc gcc-c++ meson appstream-devel >= %{appstream_version}
 BuildRequires:       pkgconfig(gtk4) >= %{gtk4_version}
 BuildRequires:       fwupd-devel >= %{fwupd_version}
 BuildRequires:       glib2-devel >= %{glib2_version}
@@ -32,9 +37,9 @@ BuildRequires:       pkgconfig(libadwaita-1) >= %{libadwaita_version}
 BuildRequires:       libxmlb-devel >= %{libxmlb_version}
 BuildRequires:       PackageKit-glib-devel >= %{packagekit_version}
 BuildRequires:       flatpak-devel >= %{flatpak_version}
-#BuildRequires:       sysprof-capture-devel
+BuildRequires:       chrpath
-#BuildRequires:       malcontent-devel
+BuildRequires:       sysprof-devel
-#BuildRequires:       malcontent-ui-devel
+BuildRequires:       pkgconfig(malcontent-0)
 
 Requires:            epiphany-runtime
 Requires:            flatpak%{?_isa} >= %{flatpak_version}
@@ -42,13 +47,13 @@ Requires:            flatpak-libs >= %{flatpak_version}
 Requires:            fwupd%{?_isa} >= %{fwupd_version}
 Requires:            glib2%{?_isa} >= %{glib2_version}
 Requires:            json-glib%{?_isa} >= %{json_glib_version}
-Requires:            libsoup%{?_isa} >= %{libsoup_version}
 Requires:            libxmlb%{?_isa} >= %{libxmlb_version}
 Requires:            PackageKit%{?_isa} >= %{packagekit_version}
 Requires:            gnome-desktop3 >= 3.18.0 gnome-menus gsettings-desktop-schemas
 Requires:            gtk3 >= 3.22.4 iso-codes libappstream-glib >= 0.7.14-3
 Requires:            librsvg2 snapd-login-service
 Requires:            rpm-ostree%{?_isa}
+Provides:            gnome-software-rpm-ostree = %{version}-%{release}
 Provides:            gnome-software-snap = %{version}-%{release}
 Provides:            gnome-software-editor = %{version}-%{release}
 Obsoletes:           gnome-software-snap < %{version}-%{release}
@@ -79,11 +84,17 @@ This subpackage contains the header files for developing GNOME software store pl
     -Drpm_ostree=true \
     -Dsoup2=true \
     -Dtests=false \
-    -Dmalcontent=false
+    -Dmalcontent=true \
+    -Dwebapps=false \
+    -Dhardcoded_foss_webapps=false \
+    -Dhardcoded_proprietary_webapps=false
 %meson_build
 
 %install
 %meson_install
+
+rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
+
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
 install -d %{buildroot}%{_datadir}/gnome-software/backgrounds
@@ -92,27 +103,41 @@ install -d %{buildroot}%{_datadir}/gnome-software/backgrounds
 
 %find_lang %name --with-gnome
 
+chrpath -d %{buildroot}%{_libdir}/%{name}/plugins-%{gs_plugin_version}/libgs_plugin_rpm-ostree.so
+chrpath -d %{buildroot}%{_libexecdir}/gnome-software-cmd
+chrpath -d %{buildroot}%{_bindir}/%{name}
+
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+#echo "%{_libdir}/rpm-ostree" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
 %files -f gnome-software.lang
 %license COPYING
 %{_bindir}/gnome-software
-%{_datadir}/applications/gnome-software-local-file.desktop
+%{_datadir}/applications/*.desktop
-%{_datadir}/applications/org.gnome.Software.desktop
 %{_datadir}/icons/hicolor/*/*/*.svg
 %{_datadir}/gnome-software/backgrounds/
 %{_datadir}/metainfo/*.xml
-%{_libdir}/gnome-software/plugins-18/*.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/*.so
-%{_libdir}/gnome-software/libgnomesoftware.so.18
+%{_libdir}/gnome-software/libgnomesoftware.so.%{gs_plugin_version}
 %{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop
-%{_datadir}/swcatalog/xml/org.gnome.Software.Popular.xml
+%{_datadir}//swcatalog/xml/org.gnome.Software.Curated.xml
 %{_datadir}/swcatalog/xml/org.gnome.Software.Featured.xml
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 %{_datadir}/dbus-1/services/org.gnome.Software.service
 %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini
 %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
 %{_libexecdir}/{gnome-software-cmd,gnome-software-restarter}
+%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_libdir}/gnome-software/libgnomesoftware.so
@@ -123,10 +148,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %files help
 %doc AUTHORS README.md
-%{_datadir}/doc/gnome-software/README.md
+%{_datadir}/doc/
 %{_mandir}/man1/gnome-software.1.*
 
 %changelog
+* Mon Nov 18 2024 laokz <zhangkai@iscas.ac.cn> - 44.5-2
+- let BuildRequire valgrind depend on system %{valgrind_arches}
+
+* Mon Nov 27 2023 lwg <liweiganga@uniontech.com> - 44.5-1
+- update to version 44.5
+
+* Thu Mar 2 2023 zhuang li  <zhuang.li@turbolinux.com.cn> - 43.2-2
+- Modified profile comments  43.2-2
+
+* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
+- Update to 43.2
+
+* Wed Aug 24 2022 caodongxia <caodongxia@h-partners.com> -42.2-2
+- Remove rpath
+
 * Tue Jun 28 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 42.2-1
 - Update to 42.2
 

gnome-software.yaml

@@ -1,4 +1,4 @@
 version_control: gitlab.gnome
 src_repo: gnome-software
 tag_prefix: "^"
-seperator: "."
+separator: "."