From 8f16e731dc8df09d7362753b759013587577655d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 15 Feb 2021 14:20:42 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gnome-settings-daemon.git#d794e70a08b588972b59a0d2d42d7c8c96a1aad1 --- gnome-settings-daemon.spec | 22 +++++++++++++++------- sources | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index cabbd61..114e672 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -7,14 +7,16 @@ %global libgweather_version 3.9.5 %global geoclue_version 2.3.1 +%global tarball_version %%(echo %{version} | tr '~' '.') + Name: gnome-settings-daemon -Version: 3.38.1 -Release: 2%{?dist} +Version: 40~beta +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE 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}/40/%{name}-%{tarball_version}.tar.xz Source1: org.gnome.settings-daemon.plugins.power.gschema.override BuildRequires: meson >= 0.44.0 @@ -85,7 +87,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{tarball_version} %build %meson @@ -98,7 +100,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %find_lang %{name} --with-gnome -mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules +mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-40.0/gtk-modules %files -f %{name}.lang %license COPYING @@ -175,7 +177,7 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libexecdir}/gsd-wwan %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.wwan.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/libgsd.so +%{_libdir}/gnome-settings-daemon-40.0/libgsd.so %{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb %{_userunitdir}/* @@ -187,10 +189,16 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml %files devel -%{_includedir}/gnome-settings-daemon-3.0 +%{_includedir}/gnome-settings-daemon-40.0 %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Mon Feb 15 2021 Florian Müllner - 40~beta-1 +- Update to 40.beta + +* Mon Feb 15 2021 Florian Müllner - 40~alpha.1-1 +- Update to 40.alpha.1 + * Tue Jan 26 2021 Fedora Release Engineering - 3.38.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d8a59cd..0fe90f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-settings-daemon-3.38.1.tar.xz) = b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd +SHA512 (gnome-settings-daemon-40.beta.tar.xz) = f3f88d65e1ec1b848c4691ec146b84c2e4d8c2b85e447b745694e48b5bc5e0ca57d1c22f114f51712a58d6d2aa35951f1f4a16d641eb992c1fce517e7df3972f