From 13421b9824b2665f99d82322893dfe9fdb1ba78137f5605ce84323ae86f9c06b Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 17 Jul 2014 10:05:13 +0000
Subject: [PATCH] Accepting request 241323 from
 home:msmeissn:branches:Base:System

- clarify the start order of the generators, as certbundle.run
  semi-depends on etc_ssl.run via a timestamp. (bnc#883386)

OBS-URL: https://build.opensuse.org/request/show/241323
OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=54
---
 ca-certificates.changes |  6 ++++++
 ca-certificates.spec    | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ca-certificates.changes b/ca-certificates.changes
index 8bb4e35..2a72a6f 100644
--- a/ca-certificates.changes
+++ b/ca-certificates.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 17 09:51:16 UTC 2014 - meissner@suse.com
+
+- clarify the start order of the generators, as certbundle.run 
+  semi-depends on etc_ssl.run via a timestamp. (bnc#883386)
+
 -------------------------------------------------------------------
 Mon Jun 23 15:24:13 UTC 2014 - lnussel@suse.de
 
diff --git a/ca-certificates.spec b/ca-certificates.spec
index ac67844..c5404d8 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -81,6 +81,13 @@ ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem
 %endif
 install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
 
+# should be done in git.
+mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,50}java.run
+mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,70}openssl.run
+mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,80}etc_ssl.run
+# certbundle.run must be run after etc_ssl.run as it uses a timestamp from it
+mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,99}certbundle.run
+
 %pre
 # migrate /etc/ssl/certs to a symlink
 if [ "$1" -ne 0 -a -d %{sslcerts} -a ! -L %{sslcerts} ]; then
@@ -141,14 +148,14 @@ rm -rf %{buildroot}
 %dir /var/lib/ca-certificates/openssl
 %{_sbindir}/update-ca-certificates
 %{_mandir}/man8/update-ca-certificates.8*
-%{_prefix}/lib/ca-certificates/update.d/java.run
-%{_prefix}/lib/ca-certificates/update.d/etc_ssl.run
-%{_prefix}/lib/ca-certificates/update.d/openssl.run
+%{_prefix}/lib/ca-certificates/update.d/*java.run
+%{_prefix}/lib/ca-certificates/update.d/*etc_ssl.run
+%{_prefix}/lib/ca-certificates/update.d/*openssl.run
 #
 %if %{with cabundle}
 %{ssletcdir}/ca-bundle.pem
 %ghost %{cabundle}
-%{_prefix}/lib/ca-certificates/update.d/certbundle.run
+%{_prefix}/lib/ca-certificates/update.d/*certbundle.run
 %endif
 
 %changelog