public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gnome-settings-daemon] rawhide: Switch to gnome-srpm-macros macros
@ 2026-06-29 15:57 Milan Crha
0 siblings, 0 replies; only message in thread
From: Milan Crha @ 2026-06-29 15:57 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gnome-settings-daemon
Branch : rawhide
Commit : 1d76c51939ec23d157b5dbbea1232e9e6aa33d80
Author : Milan Crha <mcrha@redhat.com>
Date : 2026-06-29T17:52:13+02:00
Stats : +7/-11 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-settings-daemon/c/1d76c51939ec23d157b5dbbea1232e9e6aa33d80?branch=rawhide
Log:
Switch to gnome-srpm-macros macros
[skip changelog]
---
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 32c0d4f..b3071e0 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -9,9 +9,6 @@
%global systemd_units org.gnome.SettingsDaemon.A11ySettings.service org.gnome.SettingsDaemon.Color.service org.gnome.SettingsDaemon.Datetime.service org.gnome.SettingsDaemon.Housekeeping.service org.gnome.SettingsDaemon.Keyboard.service org.gnome.SettingsDaemon.MediaKeys.service org.gnome.SettingsDaemon.Power.service org.gnome.SettingsDaemon.PrintNotifications.service org.gnome.SettingsDaemon.Rfkill.service org.gnome.SettingsDaemon.ScreensaverProxy.service org.gnome.SettingsDaemon.Sharing.service org.gnome.SettingsDaemon.Smartcard.service org.gnome.SettingsDaemon.Sound.service org.gnome.SettingsDaemon.UsbProtection.service org.gnome.SettingsDaemon.Wwan.service org.gnome.SettingsDaemon.XSettings.service
-%global tarball_version %%(echo %%{version} | tr '~' '.')
-%global major_version %%(echo %%{tarball_version} | cut -d "." -f 1)
-
Name: gnome-settings-daemon
Version: 50.1
Release: %autorelease
@@ -19,7 +16,7 @@ Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
-Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{gnome_tarball_version}.tar.xz
# gsetting overrides for RHEL in general
Source1: org.gnome.settings-daemon.plugins.housekeeping.gschema.override
@@ -27,6 +24,8 @@ Source1: org.gnome.settings-daemon.plugins.housekeeping.gschema.override
# gsetting overrides for the "Server with GUI" installation
Source100: org.gnome.settings-daemon.plugins.power.gschema.override
+%gnome_check_version
+
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: meson >= 0.64.0
@@ -101,10 +100,7 @@ for the default behavior of Workstation in the Server with GUI product.
%endif
%prep
-# check for human errors
-if [ `echo "%{version}" | grep -cE "\.alpha|\.beta|\.rc"` = "1" ]; then echo "Error: Use tilde in Version field in front of alpha/beta/rc; checked '%{version}'" 1>&2; exit 1; fi
-
-%autosetup -p1 -n %{name}-%{tarball_version}
+%autosetup -p1 -n %{name}-%{gnome_tarball_version}
%build
%meson
@@ -178,8 +174,8 @@ cp %{SOURCE1} %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
%{_libexecdir}/gsd-wwan
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.wwan.gschema.xml
-%dir %{_libdir}/gnome-settings-daemon-%{major_version}
-%{_libdir}/gnome-settings-daemon-%{major_version}/libgsd.so
+%dir %{_libdir}/gnome-settings-daemon-%{gnome_major_version}
+%{_libdir}/gnome-settings-daemon-%{gnome_major_version}/libgsd.so
%{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb
%{_userunitdir}/gnome-session-x11-services-ready.target.wants/
@@ -194,7 +190,7 @@ cp %{SOURCE1} %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
%files devel
-%{_includedir}/gnome-settings-daemon-%{major_version}
+%{_includedir}/gnome-settings-daemon-%{gnome_major_version}
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%if 0%{?rhel}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-29 15:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29 15:57 [rpms/gnome-settings-daemon] rawhide: Switch to gnome-srpm-macros macros Milan Crha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox