diff --git a/gnome-settings-daemon-3.38.2.tar.xz b/gnome-settings-daemon-3.38.2.tar.xz deleted file mode 100644 index 3575d9c..0000000 Binary files a/gnome-settings-daemon-3.38.2.tar.xz and /dev/null differ diff --git a/gnome-settings-daemon-42.2.tar.xz b/gnome-settings-daemon-42.2.tar.xz new file mode 100644 index 0000000..6c1a4c5 Binary files /dev/null and b/gnome-settings-daemon-42.2.tar.xz differ diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index dbd4ffc..15d25fa 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,30 +1,37 @@ +%global glib2_version 2.56 +%global colord_version 1.4.5 +%global geocode_glib_version 3.10.0 +%global gnome_desktop_version 3.37.1 +%global gsettings_desktop_schemas_version 42.0 +%global gtk3_version 3.15.3 +%global geoclue_version 2.3.1 + +%global tarball_version %%(echo %{version} | tr '~' '.') +%global major_version %%(echo %{version} | cut -f 1 -d '~' | cut -f 1 -d '.') + Name: gnome-settings-daemon -Version: 3.38.2 -Release: 2 +Version: 42.2 +Release: 1 Summary: Settings of GNOME Sessions and related applications License: GPLv2+ URL: https://download.gnome.org/sources/%{name} -Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz Source1: org.gnome.settings-daemon.plugins.power.gschema.override BuildRequires: cups-devel gcc gettext meson >= 0.44.0 perl-interpreter pkgconfig(alsa) -BuildRequires: pkgconfig(colord) >= 1.3.5 pkgconfig(fontconfig) pkgconfig(geoclue-2.0) >= 2.3.1 -BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0 pkgconfig(glib-2.0) >= 2.53.0 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.34.2 pkgconfig(gsettings-desktop-schemas) >= 3.35.91 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3 pkgconfig(gudev-1.0) pkgconfig(gweather-3.0) >= 3.9.5 +BuildRequires: pkgconfig(colord) >= %{colord_version} pkgconfig(fontconfig) pkgconfig(geoclue-2.0) >= %{geoclue_version} +BuildRequires: pkgconfig(geocode-glib-1.0) >= %{geocode_glib_version} pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} pkgconfig(gudev-1.0) pkgconfig(gweather4) BuildRequires: pkgconfig(lcms2) >= 2.2 pkgconfig(libcanberra-gtk3) pkgconfig(libgeoclue-2.0) BuildRequires: pkgconfig(libnm) pkgconfig(libnotify) pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(librsvg-2.0) pkgconfig(nss) pkgconfig(polkit-gobject-1) pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) pkgconfig(xi) pkgconfig(xtst) pkgconfig(wayland-client) BuildRequires: pkgconfig(libwacom) >= 0.7 pkgconfig(xorg-wacom) pkgconfig(gcr-base-3) pkgconfig(mm-glib) chrpath -Requires: colord geoclue2 >= 2.3.1 geocode-glib >= 3.10.0 glib2 >= 2.53.0 -Requires: gnome-desktop3 >= 3.27.90 gsettings-desktop-schemas >= 3.23.3 -Requires: gtk3 >= 3.15.3 iio-sensor-proxy libgweather >= 3.9.5 - -Obsoletes: %{name}-updates < 3.13.1 drwright < 3.5.0-3 gnome-settings-daemon-devel < 3.23.1 - -Conflicts: gdm < 1:3.27.90 gnome-session < 3.27.90 gnome-shell < 3.25.4 +Requires: colord >= %{colord_version} geoclue2 >= %{geoclue_version} geocode-glib >= %{geocode_glib_version} glib2 >= %{glib2_version} +Requires: gnome-desktop3 >= %{gnome_desktop_version} gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version} +Requires: gtk3 >= %{gtk3_version} iio-sensor-proxy pkgconfig(gweather4) %description The GNOME Settings Daemon is responsible for setting various parameters of a @@ -48,7 +55,7 @@ and other related development files of gnome-settings-daemon. %install %meson_install -cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %find_lang %{name} --with-gnome @@ -74,7 +81,7 @@ echo "%{_libdir}/gnome-settings-daemon-3.0" > %{buildroot}%{_sysconfdir}/ld.so.c %{_userunitdir}/* %{_datadir}/glib-2.0/schemas/* %{_datadir}/polkit-1/actions/* -%{_libdir}/gnome-settings-daemon-3.0/libgsd.so +%{_libdir}/gnome-settings-daemon-%{major_version}/libgsd.so %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf /usr/lib/udev/rules.d/*.rules @@ -82,10 +89,13 @@ echo "%{_libdir}/gnome-settings-daemon-3.0" > %{buildroot}%{_sysconfdir}/ld.so.c %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert %files devel -%{_includedir}/gnome-settings-daemon-3.0 +%{_includedir}/gnome-settings-daemon-%{major_version} %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Mon Jun 6 2022 lin zhang - 42.2-1 +- Upgrade to 42.2 + * Thu Sep 09 2021 lingsheng - 3.38.2-2 - Delete rpath setting diff --git a/gnome-settings-daemon.yaml b/gnome-settings-daemon.yaml index 771b6e8..557ac01 100644 --- a/gnome-settings-daemon.yaml +++ b/gnome-settings-daemon.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: gnome-settings-daemon tag_prefix: GNOME_SETTINGS_DAEMON_ -seperator: _ +separator: _