From 660522ae5ad1e502d705720ac68b36d674a13c1d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 20 Jun 2013 16:30:22 +0200 Subject: [PATCH] cpio: revert previous commit I have done a little bit of observation and that change is not as easy as it could look. Firstly - asking for %{_sbindir}/rmt is not OK because we have older systems like RHEL6- which has only /sbin/rmt and not /usr/sbin/rmt. Secondly, I looked at some older debian system, and it does not have the /sbin/rmt (but has only /usr/sbin/rmt). Looking at star source code, star based utilities always try to look for /etc/rmt (which, btw seems to exist on all platforms). ~> For that ^^ reasons, I'm switching back to /etc/rmt This reverts commit 1518d48b252433e1e311be8866239ad0135b19bc Version: 2.11-20 --- cpio.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cpio.spec b/cpio.spec index ea71e1c..a064004 100644 --- a/cpio.spec +++ b/cpio.spec @@ -1,7 +1,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.11 -Release: 21%{?dist} +Release: 20%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -67,7 +67,7 @@ autoreconf -v %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -pedantic -fno-strict-aliasing -Wall" -%configure --with-rmt="%{_sbindir}/rmt" +%configure --with-rmt="%{_sysconfdir}/rmt" make %{?_smp_mflags} %install @@ -110,9 +110,6 @@ fi %{_infodir}/*.info* %changelog -* Thu Jun 20 2013 Pavel Raiskup - 2.11-21 -- the symlink /etc/rmt should be removed in future (related to #966066) - * Wed Mar 27 2013 Pavel Raiskup - 2.11-20 - fix another bogus date in changelog - update config.guess/config.sub for aarm64 build (#925189)