PR#56: Apply patch to set %_sbindir the same as %_bindir - rpms/rpm

Zbigniew Jędrzejewski-Szmek • a month ago

1e7acb5

rpm-4.19.1-unify-bindir-sbindir.patch

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ From 4278af9dc666548cb43c66645ee6be08b408337f Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>`
		`+ Date: Mon, 15 Jan 2024 18:36:42 +0100`
		`+ Subject: [PATCH] Configure %_sbindir to be the same as %_bindir`
		`+`
		`+ https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin`
		`+ ---`
		`+ CMakeLists.txt \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`+ index 5b63069a96..b50355c8a8 100644`
		`+ --- a/CMakeLists.txt`
		`+ +++ b/CMakeLists.txt`
		`+ @@ -75,7 +75,7 @@ function(makemacros)`
		`+ set(prefix ${CMAKE_INSTALL_PREFIX})`
		`+ set(exec_prefix "\${prefix}")`
		`+ set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")`
		`+ - set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}")`
		`+ + set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")`
		`+ set(libexecdir "\${exec_prefix}/${CMAKE_INSTALL_LIBEXECDIR}")`
		`+ set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")`
		`+ set(datadir "\${datarootdir}")`

rpm.spec

file modified

+7 -2

		`@@ -27,7 +27,7 @@`

		`%global rpmver 4.19.1.1`
		`#global snapver rc1`
		`- %global baserelease 1`
		`+ %global baserelease 2`
		`%global sover 10`

		`%global srcver %{rpmver}%{?snapver:-%{snapver}}`
		`@@ -130,8 +130,10 @@`
		`rpm-4.18.x-siteconfig.patch`
		`# In current Fedora, man-pages pkg owns all the localized man directories`
		`rpm-4.9.90-no-man-dirs.patch`
		`- # Disable new user/group handling`
		`+ # Make %%_sbindir and %%_bindir the same`
		`+ rpm-4.19.1-unify-bindir-sbindir.patch`

		`+ # Disable new user/group handling`
		`rpm-4.18.92-disable-sysusers.patch`
		`rpm-4.18.90-weak-user-group.patch`

		`@@ -614,6 +616,9 @@`
		`%doc %{_defaultdocdir}/rpm/API/`

		`%changelog`
		`+ * Sun Apr 7 2024 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 4.19.1.1-2`
		`+ - Apply patch to set %%_sbindir the same as %%_bindir`
		`+`
		`* Wed Feb 07 2024 Michal Domonkos <mdomonko@redhat.com> - 4.19.1.1-1`
		`- Update to 4.19.1.1 (https://rpm.org/wiki/Releases/4.19.1.1)`