Fix symbolic links to packaged files
Resolves: RHEL-40564
This commit is contained in:
Petr Písař
parent
36454fe75e
commit
54b3fc7eed
105
0002-spec-Fix-symbolic-links-to-packaged-files.patch
Normal file
105
0002-spec-Fix-symbolic-links-to-packaged-files.patch
Normal file
@ -0,0 +1,105 @@
|
||||
From 73ef31daf47fe0a90f0cda225c585ba4ceec9420 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Fri, 14 Jun 2024 17:46:04 +0200
|
||||
Subject: [PATCH] spec: Fix symbolic links to packaged files
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream commit: 73ef31daf47fe0a90f0cda225c585ba4ceec9420
|
||||
|
||||
Some relative symlinks had an incorrect nesting:
|
||||
|
||||
$ rpm -qlv dnf-plugins-core-4.7.0-2.el10.noarch | grep dnf-offline
|
||||
lrwxrwxrwx 1 root root 70 Jun 6 02:00 /usr/share/man/man8/dnf-offline-distrosync.8.gz -> ../../../../../../../../../usr/share/man/man8/dnf4-system-upgrade.8.gz
|
||||
lrwxrwxrwx 1 root root 70 Jun 6 02:00 /usr/share/man/man8/dnf-offline-upgrade.8.gz -> ../../../../../../../../../usr/share/man/man8/dnf4-system-upgrade.8.gz
|
||||
|
||||
Also rpmlint and recenct rpmbuild complained on using absolute
|
||||
symlinks:
|
||||
|
||||
dnf-plugins-core.noarch: W: symlink-should-be-relative /usr/share/man/man8/dnf4-offline-distrosync.8.gz /usr/share/man/man8/dnf4-system-upgrade.8.gz
|
||||
dnf-plugins-core.noarch: W: symlink-should-be-relative /usr/share/man/man8/dnf4-offline-upgrade.8.gz /usr/share/man/man8/dnf4-system-upgrade.8.gz
|
||||
|
||||
This patch fixes all these issues.
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-40564
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
dnf-plugins-core.spec | 46 +++++++++++++++++++++----------------------
|
||||
1 file changed, 23 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
|
||||
index f0984dd..969233b 100644
|
||||
--- a/dnf-plugins-core.spec
|
||||
+++ b/dnf-plugins-core.spec
|
||||
@@ -498,15 +498,15 @@ pushd %{buildroot}%{_unitdir}/system-update.target.wants/
|
||||
ln -sr ../dnf-system-upgrade.service
|
||||
popd
|
||||
|
||||
-ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-upgrade.8.gz
|
||||
-ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-distrosync.8.gz
|
||||
+ln -sf dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-upgrade.8.gz
|
||||
+ln -sf dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-distrosync.8.gz
|
||||
%endif
|
||||
|
||||
%if %{without dnf5_obsoletes_dnf}
|
||||
for file in %{buildroot}%{_mandir}/man8/dnf4[-.]*; do
|
||||
dir=$(dirname $file)
|
||||
filename=$(basename $file)
|
||||
- ln -sr $file $dir/${filename/dnf4/dnf}
|
||||
+ ln -sf $filename $dir/${filename/dnf4/dnf}
|
||||
done
|
||||
%endif
|
||||
|
||||
@@ -522,28 +522,28 @@ rm -vf %{buildroot}%{_libexecdir}/dnf-utils-*
|
||||
|
||||
%if %{with yumutils}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repo-graph
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/package-cleanup
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoclosure
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repodiff
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repomanage
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoquery
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
|
||||
-ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repo-graph
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/package-cleanup
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoclosure
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repodiff
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repomanage
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoquery
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
|
||||
+ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
|
||||
# These commands don't have a dedicated man page, so let's just point them
|
||||
# to the utils page which contains their descriptions.
|
||||
-ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
||||
-ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
||||
-ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
||||
+ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
||||
+ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
||||
+ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
||||
%endif
|
||||
|
||||
%check
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@ -36,12 +36,13 @@
|
||||
|
||||
Name: dnf-plugins-core
|
||||
Version: 4.7.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Core Plugins for DNF
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://github.com/rpm-software-management/dnf-plugins-core
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-needs-restarting-Revert-using-systemd-start-time.patch
|
||||
Patch2: 0002-spec-Fix-symbolic-links-to-packaged-files.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gettext
|
||||
@ -499,15 +500,15 @@ pushd %{buildroot}%{_unitdir}/system-update.target.wants/
|
||||
ln -sr ../dnf-system-upgrade.service
|
||||
popd
|
||||
|
||||
ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-upgrade.8.gz
|
||||
ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-distrosync.8.gz
|
||||
ln -sf dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-upgrade.8.gz
|
||||
ln -sf dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-distrosync.8.gz
|
||||
%endif
|
||||
|
||||
%if %{without dnf5_obsoletes_dnf}
|
||||
for file in %{buildroot}%{_mandir}/man8/dnf4[-.]*; do
|
||||
dir=$(dirname $file)
|
||||
filename=$(basename $file)
|
||||
ln -sr $file $dir/${filename/dnf4/dnf}
|
||||
ln -sf $filename $dir/${filename/dnf4/dnf}
|
||||
done
|
||||
%endif
|
||||
|
||||
@ -523,28 +524,28 @@ rm -vf %{buildroot}%{_libexecdir}/dnf-utils-*
|
||||
|
||||
%if %{with yumutils}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repo-graph
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/package-cleanup
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoclosure
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repodiff
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repomanage
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoquery
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
|
||||
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repo-graph
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/package-cleanup
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoclosure
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repodiff
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repomanage
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoquery
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
|
||||
ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
|
||||
# These commands don't have a dedicated man page, so let's just point them
|
||||
# to the utils page which contains their descriptions.
|
||||
ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
||||
ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
||||
ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
||||
ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
||||
ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
||||
ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -868,6 +869,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 14 2024 Petr Pisar <ppisar@redhat.com> - 4.7.0-3
|
||||
- Fix symbolic links to packaged files (RHEL-40564)
|
||||
|
||||
* Thu Jun 06 2024 Petr Pisar <ppisar@redhat.com> - 4.7.0-2
|
||||
- Revert using systemd start time in needs-restarting (RHEL-35577)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user