From d987b14eb72f90a087347d5cf63f0e9e5175b47175440a54f217530a55029b51 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Fri, 6 Dec 2013 12:40:44 +0000
Subject: [PATCH] Accepting request 209623 from
 home:lnussel:branches:Base:System

- etc_ssl.run: fix typo
- turn /etc/ssl/certs into a symlink to /var/lib/ca-certificates/pem

OBS-URL: https://build.opensuse.org/request/show/209623
OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=42
---
 ca-certificates-1_201310161709.tar.xz |  3 ---
 ca-certificates-1_201312061005.tar.xz |  3 +++
 ca-certificates.changes               |  6 ++++++
 ca-certificates.spec                  | 13 ++++++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 ca-certificates-1_201310161709.tar.xz
 create mode 100644 ca-certificates-1_201312061005.tar.xz

diff --git a/ca-certificates-1_201310161709.tar.xz b/ca-certificates-1_201310161709.tar.xz
deleted file mode 100644
index 4ddcb0b..0000000
--- a/ca-certificates-1_201310161709.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d0f47dd0cc68636ea047c2eeae7b697aa522deb1a1e6b4d63cb7df21634bfb0
-size 11380
diff --git a/ca-certificates-1_201312061005.tar.xz b/ca-certificates-1_201312061005.tar.xz
new file mode 100644
index 0000000..f368692
--- /dev/null
+++ b/ca-certificates-1_201312061005.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9aa16cd356588fd992eb9340ce2a07bfe59fa7ed16e2a0439e95b23c7dd2e5d4
+size 11464
diff --git a/ca-certificates.changes b/ca-certificates.changes
index b173007..6bca7c7 100644
--- a/ca-certificates.changes
+++ b/ca-certificates.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  6 09:16:11 UTC 2013 - lnussel@suse.de
+
+- etc_ssl.run: fix typo
+- turn /etc/ssl/certs into a symlink to /var/lib/ca-certificates/pem
+
 -------------------------------------------------------------------
 Wed Oct 16 15:11:26 UTC 2013 - lnussel@suse.de
 
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 36c8b60..0d7fab0 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -29,7 +29,7 @@ Name:           ca-certificates
 %define ssletcdir %{_sysconfdir}/ssl
 %define cabundle  /var/lib/ca-certificates/ca-bundle.pem
 %define sslcerts  %{ssletcdir}/certs
-Version:        1_201310161709
+Version:        1_201312061005
 Release:        0
 Summary:        Utilities for system wide CA certificate installation
 License:        GPL-2.0+
@@ -69,17 +69,24 @@ rm -f certbundle.run
 %make_install
 install -d m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist}
 install -d m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist}
-install -d m 755 %{buildroot}/etc/ssl/certs
+install -d m 755 %{buildroot}%{ssletcdir}
 install -d m 755 %{buildroot}/etc/ca-certificates/update.d
 install -d m 755 %{buildroot}%{_prefix}/lib/ca-certificates/update.d
 install -d m 755 %{buildroot}/var/lib/ca-certificates/pem
 install -d m 755 %{buildroot}/var/lib/ca-certificates/openssl
+ln -s /var/lib/ca-certificates/pem %{buildroot}%{sslcerts}
 %if %{with cabundle}
 install -D -m 644 /dev/null %{buildroot}/%{cabundle}
 ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem
 %endif
 install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
 
+%pre
+# migrate /etc/ssl/certs to a symlink
+if [ "$1" -ne 0 -a -d %{sslcerts} -a ! -L %{sslcerts} ]; then
+	mv -T --backup=numbered %{sslcerts} %{sslcerts}.rpmsave && ln -s /var/lib/ca-certificates/pem %{sslcerts}
+fi
+
 %post
 if [ -s /etc/ca-certificates.conf ]; then
 	while read line; do
@@ -114,7 +121,7 @@ rm -rf %{buildroot}
 %dir %{trustdir_static}
 %dir %{trustdir_static}/anchors
 %dir %{trustdir_static}/blacklist
-%dir /etc/ssl/certs
+%sslcerts
 %ghost /var/lib/ca-certificates/java-cacerts
 %dir /etc/ca-certificates
 %dir /etc/ca-certificates/update.d