diff --git a/gnome-software-42.2.tar.xz b/gnome-software-42.2.tar.xz deleted file mode 100644 index 47677dd..0000000 Binary files a/gnome-software-42.2.tar.xz and /dev/null differ diff --git a/gnome-software-43.2.tar.xz b/gnome-software-43.2.tar.xz new file mode 100644 index 0000000..7558901 Binary files /dev/null and b/gnome-software-43.2.tar.xz differ diff --git a/gnome-software.spec b/gnome-software.spec index 959728c..2134ed9 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,21 +1,25 @@ %global appstream_version 0.14.0 -%global libadwaita_version 1.0.1 -%global libxmlb_version 0.1.7 +%global flatpak_version 1.5.1 +%global fwupd_version 1.3.3 %global glib2_version 2.61.1 %global gtk4_version 4.4.0 %global json_glib_version 1.2.0 +%global libadwaita_version 1.0.1 %global libsoup_version 2.52.0 +%global libxmlb_version 0.1.7 %global packagekit_version 1.1.1 -%global fwupd_version 1.3.3 -%global flatpak_version 1.5.1 + +%define gs_plugin_version 19 + +%global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$ Name: gnome-software -Version: 42.2 -Release: 2 +Version: 43.2 +Release: 1 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/43/%{name}-%{version}.tar.xz Patch01: 0001-crash-with-broken-theme.patch BuildRequires: gettext libxslt docbook-style-xsl desktop-file-utils gtk-doc @@ -23,7 +27,7 @@ BuildRequires: gnome-desktop3-devel gspell-devel polkit-devel 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: gcc gcc-c++ meson appstream-devel +BuildRequires: gcc gcc-c++ meson appstream-devel >= %{appstream_version} BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} BuildRequires: fwupd-devel >= %{fwupd_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -33,9 +37,8 @@ BuildRequires: libxmlb-devel >= %{libxmlb_version} BuildRequires: PackageKit-glib-devel >= %{packagekit_version} BuildRequires: flatpak-devel >= %{flatpak_version} BuildRequires: chrpath -#BuildRequires: sysprof-capture-devel -#BuildRequires: malcontent-devel -#BuildRequires: malcontent-ui-devel +BuildRequires: sysprof-devel +BuildRequires: pkgconfig(malcontent-0) Requires: epiphany-runtime Requires: flatpak%{?_isa} >= %{flatpak_version} @@ -50,6 +53,7 @@ Requires: gnome-desktop3 >= 3.18.0 gnome-menus gsettings-desktop-sche 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} @@ -80,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 @@ -93,7 +103,7 @@ install -d %{buildroot}%{_datadir}/gnome-software/backgrounds %find_lang %name --with-gnome -chrpath -d %{buildroot}%{_libdir}/%{name}/plugins-18/libgs_plugin_rpm-ostree.so +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} @@ -113,22 +123,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -f gnome-software.lang %license COPYING %{_bindir}/gnome-software -%{_datadir}/applications/gnome-software-local-file.desktop -%{_datadir}/applications/org.gnome.Software.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/gnome-software/backgrounds/ %{_datadir}/metainfo/*.xml -%{_libdir}/gnome-software/plugins-18/*.so -%{_libdir}/gnome-software/libgnomesoftware.so.18 +%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/*.so +%{_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 @@ -140,10 +148,13 @@ 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 Jan 02 2023 lin zhang - 43.2-1 +- Update to 43.2 + * Wed Aug 24 2022 caodongxia -42.2-2 - Remove rpath