public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cinnamon] rawhide: Replace legacy RPM macros with plain commands
Date: Sun, 26 Jul 2026 14:03:46 GMT [thread overview]
Message-ID: <178507462692.1.17148380420139553581.rpms-cinnamon-a2869ddfe191@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cinnamon
Branch : rawhide
Commit : a2869ddfe191567dad4f4dcfda141d36f73388d6
Author : Michal Schorm <mschorm@redhat.com>
Date : 2026-07-26T15:44:08+02:00
Stats : +11/-11 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/cinnamon/c/a2869ddfe191567dad4f4dcfda141d36f73388d6?branch=rawhide
Log:
Replace legacy RPM macros with plain commands
Replace '%{__sed}', '%{__cat}', '%{__rm}', '%{__install}', and
'%{__ln_s}' with plain 'sed', 'cat', 'rm', 'install', and
'ln -s'. The macro indirection adds no value -- the commands are
always available in the buildroot and the macros just expand to
the same binaries.
Co-Authored-By: Claude AI <noreply@anthropic.com>
---
diff --git a/cinnamon.spec b/cinnamon.spec
index ed3692c..7bbb4d4 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -198,10 +198,10 @@ Calendar server for Cinnamon.
%prep
%autosetup -p1 -n %{name}-%{upstream_version}
-%{__sed} -i -e 's@gksu@pkexec@g' files%{_bindir}/%{name}-settings-users
-%{__sed} -i -e 's@gnome-orca@orca@g' files%{_datadir}/%{name}/%{name}-settings/modules/cs_accessibility.py
+sed -i -e 's@gksu@pkexec@g' files%{_bindir}/%{name}-settings-users
+sed -i -e 's@gnome-orca@orca@g' files%{_datadir}/%{name}/%{name}-settings/modules/cs_accessibility.py
# remove mintlocale im from settings
-%{__sed} -i -e 's@mintlocale im@mintlocale_im_removed@g' files%{_datadir}/%{name}/%{name}-settings/%{name}-settings.py
+sed -i -e 's@mintlocale im@mintlocale_im_removed@g' files%{_datadir}/%{name}/%{name}-settings/%{name}-settings.py
# Fix rpmlint errors
for file in files%{_datadir}/%{name}/applets/settings-example@cinnamon.org/*.py \
@@ -226,31 +226,31 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py
%meson_install
# install common gschema override
-%{__install} --target-directory=%{buildroot}%{_datadir}/glib-2.0/schemas \
+install --target-directory=%{buildroot}%{_datadir}/glib-2.0/schemas \
-Dpm 0644 %{SOURCE1}
# install gschema-override for apps
-%{__sed} -e 's!@pkg_manager@!org.mageia.dnfdragora.desktop!g' \
+sed -e 's!@pkg_manager@!org.mageia.dnfdragora.desktop!g' \
< %{SOURCE2} > %{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-apps.gschema.override
# install gschema-override for wallpaper
-%{__cat} >> %{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-wallpaper.gschema.override << EOF
+cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-wallpaper.gschema.override << EOF
[org.cinnamon.desktop.background]
picture-uri='file:///usr/share/backgrounds/tiles/default_blue.jpg'
EOF
# install style file for mint-x and mint-y
-%{__install} --target-directory=%{buildroot}%{_datadir}/%{name}/styles.d/ \
+install --target-directory=%{buildroot}%{_datadir}/%{name}/styles.d/ \
-Dpm 0644 %{SOURCE3}
# Provide symlink for the background-propeties.
-%{__ln_s} %{_datadir}/gnome-background-properties %{buildroot}%{_datadir}/%{name}-background-properties
+ln -s %{_datadir}/gnome-background-properties %{buildroot}%{_datadir}/%{name}-background-properties
# Delete useless gir files
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/*.gir
+rm -rf %{buildroot}%{_datadir}/%{name}/*.gir
# Delete cinnamon2d files
-%{__rm} -rf %{buildroot}%{_bindir}/cinnamon2d
-%{__rm} -rf %{buildroot}%{_mandir}/man1/cinnamon2d*
+rm -rf %{buildroot}%{_bindir}/cinnamon2d
+rm -rf %{buildroot}%{_mandir}/man1/cinnamon2d*
%check
%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
reply other threads:[~2026-07-26 14:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178507462692.1.17148380420139553581.rpms-cinnamon-a2869ddfe191@fedoraproject.org \
--to=mschorm@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox