From b8381807077291c2a2dfd3effe5d0a4a90a79ab097600c7060ee07616cff6f4c Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Mon, 24 Jun 2013 11:21:23 +0000
Subject: [PATCH] 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
---
 ca-certificates-mozilla.changes |  5 +++++
 ca-certificates-mozilla.spec    | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

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