1
0

Accepting request 180733 from home:lnussel:branches:Base:System

- use correct 'anchors' subdirectory

OBS-URL: https://build.opensuse.org/request/show/180733
OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates-mozilla?expand=0&rev=35
This commit is contained in:
Ludwig Nussel 2013-06-24 11:21:23 +00:00 committed by Git OBS Bridge
parent b9942cd5a7
commit b838180707
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 21 12:59:53 UTC 2013 - lnussel@suse.de
- use correct 'anchors' subdirectory
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 19 09:30:00 UTC 2013 - lnussel@suse.de Wed Jun 19 09:30:00 UTC 2013 - lnussel@suse.de

View File

@ -18,12 +18,14 @@
%if 0%{?suse_version} < 1310 %if 0%{?suse_version} < 1310
%bcond_with trustedcerts %bcond_with trustedcerts
%define trustdir_static %{_datadir}/ca-certificates/mozilla %define certdir %{_datadir}/ca-certificates/mozilla
%else %else
%bcond_without trustedcerts %bcond_without trustedcerts
%define certdir %{trustdir_static}/anchors
BuildRequires: p11-kit-devel BuildRequires: p11-kit-devel
%endif %endif
BuildRequires: ca-certificates
BuildRequires: openssl BuildRequires: openssl
Name: ca-certificates-mozilla Name: ca-certificates-mozilla
@ -73,7 +75,7 @@ install -m 644 %{S:1} COPYING
perl %{SOURCE1} --trustbits < certdata.txt perl %{SOURCE1} --trustbits < certdata.txt
%install %install
mkdir -p %{buildroot}/%{trustdir_static} mkdir -p %{buildroot}/%{certdir}
set +x set +x
for i in *.pem; do for i in *.pem; do
args=() args=()
@ -95,7 +97,7 @@ for i in *.pem; do
{ {
grep '^#' "$i" grep '^#' "$i"
openssl x509 -in "$i" "${args[@]}" openssl x509 -in "$i" "${args[@]}"
} > "%{buildroot}/%{trustdir_static}/$i" } > "%{buildroot}/%{certdir}/$i"
done done
set -x set -x
@ -108,6 +110,6 @@ update-ca-certificates || true
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc COPYING %doc COPYING
%{trustdir_static} %{certdir}
%changelog %changelog