rpms/ca-certificates
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use sln, not ln, to avoid the dependency on coreutils.

Browse Source
This commit is contained in:
Kai Engert 2016-05-10 18:48:44 +02:00
parent de9cf5de04
commit 5300aa7f75
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ca-certificates.spec
View File

@ -39,7 +39,7 @@ Name: ca-certificates
Version: 2016.2.7 Version: 2016.2.7
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 3%{?dist} Release: 4%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
@ -67,8 +67,6 @@ BuildArch: noarch
Requires: p11-kit >= 0.19.2 Requires: p11-kit >= 0.19.2
Requires: p11-kit-trust >= 0.19.2 Requires: p11-kit-trust >= 0.19.2
Requires: coreutils
Requires(post): coreutils
BuildRequires: perl BuildRequires: perl
BuildRequires: python BuildRequires: python
BuildRequires: openssl BuildRequires: openssl
@ -254,18 +252,17 @@ touch $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/%{trusted_all_bundle}
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle} touch $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle}
# /etc/ssl/certs symlink for 3rd-party tools # /etc/ssl/certs symlink for 3rd-party tools
ln -s ../pki/tls/certs \ sln ../pki/tls/certs \
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs
# legacy filenames # legacy filenames
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
$RPM_BUILD_ROOT%{pkidir}/tls/cert.pem $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
$RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle} $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle}
ln -s %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \ sln %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \
$RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle} $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle}
ln -s %{catrustdir}/extracted/%{java_bundle} \ sln %{catrustdir}/extracted/%{java_bundle} \
$RPM_BUILD_ROOT%{pkidir}/%{java_bundle} $RPM_BUILD_ROOT%{pkidir}/%{java_bundle}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -376,6 +373,9 @@ fi
%changelog %changelog
* Tue May 10 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-4
- Use sln, not ln, to avoid the dependency on coreutils.
* Mon Apr 25 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-3 * Mon Apr 25 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-3
- Fix typos in a manual page and in a README file. - Fix typos in a manual page and in a README file.

4
ca-legacy
View File

@ -32,10 +32,10 @@ do_install()
is_disabled is_disabled
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
# found, legacy is disabled # found, legacy is disabled
ln -sf $LDISABLE $LLINK sln $LDISABLE $LLINK
else else
# expression not found, legacy is set to default # expression not found, legacy is set to default
ln -sf $LDEFAULT $LLINK sln $LDEFAULT $LLINK
fi fi
} }