From 5300aa7f7517bc79a72ad8c4f189cade93b09db5 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Tue, 10 May 2016 18:48:44 +0200 Subject: [PATCH] Use sln, not ln, to avoid the dependency on coreutils. --- ca-certificates.spec | 28 ++++++++++++++-------------- ca-legacy | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ca-certificates.spec b/ca-certificates.spec index 538ec46..1c5393a 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -39,7 +39,7 @@ Name: ca-certificates Version: 2016.2.7 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Base @@ -67,8 +67,6 @@ BuildArch: noarch Requires: p11-kit >= 0.19.2 Requires: p11-kit-trust >= 0.19.2 -Requires: coreutils -Requires(post): coreutils BuildRequires: perl BuildRequires: python BuildRequires: openssl @@ -254,18 +252,17 @@ touch $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/%{trusted_all_bundle} touch $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle} # /etc/ssl/certs symlink for 3rd-party tools -ln -s ../pki/tls/certs \ - $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs +sln ../pki/tls/certs \ + $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs # legacy filenames -ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ - $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem -ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ - $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle} -ln -s %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \ - $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle} -ln -s %{catrustdir}/extracted/%{java_bundle} \ - $RPM_BUILD_ROOT%{pkidir}/%{java_bundle} - +sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ + $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem +sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ + $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle} +sln %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \ + $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle} +sln %{catrustdir}/extracted/%{java_bundle} \ + $RPM_BUILD_ROOT%{pkidir}/%{java_bundle} %clean rm -rf $RPM_BUILD_ROOT @@ -376,6 +373,9 @@ fi %changelog +* Tue May 10 2016 Kai Engert - 2016.2.7-4 +- Use sln, not ln, to avoid the dependency on coreutils. + * Mon Apr 25 2016 Kai Engert - 2016.2.7-3 - Fix typos in a manual page and in a README file. diff --git a/ca-legacy b/ca-legacy index d63489e..cb164fb 100644 --- a/ca-legacy +++ b/ca-legacy @@ -32,10 +32,10 @@ do_install() is_disabled if [ $? -eq 0 ]; then # found, legacy is disabled - ln -sf $LDISABLE $LLINK + sln $LDISABLE $LLINK else # expression not found, legacy is set to default - ln -sf $LDEFAULT $LLINK + sln $LDEFAULT $LLINK fi }