From 10f7a73494fe38f9a0d1cedc2f49a15c198aa5aa514fd5709d7f0e6d13ae3e62 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Wed, 9 Jun 2021 15:04:30 +0000
Subject: [PATCH] - Update to version 2+git20210609.a4969d7:   * Restore
 /etc/ssl/ca-bundle.pem if it doesn't exist   * Get rid of ls   * Fix indent
 inconsistencies   * Create /var/lib/ca-certificates if needed   * Install
 hooks with correct number   * Remove legacy files

OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=95
---
 _service                                     | 11 +++--------
 _servicedata                                 |  2 +-
 ca-certificates-2+git20210309.8214505.tar.xz |  3 ---
 ca-certificates.changes                      | 11 +++++++++++
 ca-certificates.spec                         | 15 ++++-----------
 5 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 ca-certificates-2+git20210309.8214505.tar.xz

diff --git a/_service b/_service
index ef97265..3126a12 100644
--- a/_service
+++ b/_service
@@ -1,16 +1,11 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="obs_scm" mode="manual">
     <param name="version">2</param>
     <param name="versionformat">2+git%cd.%h</param>
     <param name="url">http://github.com/openSUSE/ca-certificates.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="disabled">
-    <param name="compression">xz</param>
-    <param name="file">*.tar</param>
-  </service>
-  <service name="set_version" mode="disabled">
-    <param name="file">ca-certificates.spec</param>
-  </service>
+  <service mode="buildtime" name="tar"/>
+  <service mode="buildtime" name="set_version"/>
 </services>
diff --git a/_servicedata b/_servicedata
index 8a018ae..5c4b690 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">http://github.com/openSUSE/ca-certificates.git</param>
-          <param name="changesrevision">8ceeb6993bb9de982996b70b21c3da3896078c94</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">a4969d733d0059aafbc4c5fed6ead94d30f03f5b</param></service></servicedata>
\ No newline at end of file
diff --git a/ca-certificates-2+git20210309.8214505.tar.xz b/ca-certificates-2+git20210309.8214505.tar.xz
deleted file mode 100644
index e4fd5cf..0000000
--- a/ca-certificates-2+git20210309.8214505.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28e241597f75c2918bf56e9bf72d32df80825465d4afc90e3fc1aefe5500422d
-size 11144
diff --git a/ca-certificates.changes b/ca-certificates.changes
index e574be1..e5763bf 100644
--- a/ca-certificates.changes
+++ b/ca-certificates.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jun 09 15:03:55 UTC 2021 - lnussel@suse.de
+
+- Update to version 2+git20210609.a4969d7:
+  * Restore /etc/ssl/ca-bundle.pem if it doesn't exist
+  * Get rid of ls
+  * Fix indent inconsistencies
+  * Create /var/lib/ca-certificates if needed
+  * Install hooks with correct number
+  * Remove legacy files
+
 -------------------------------------------------------------------
 Thu Mar 18 17:22:38 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 75217ef..18c1578 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -33,7 +33,7 @@ Release:        0
 Summary:        Utilities for system wide CA certificate installation
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
-Source0:        ca-certificates-%{version}.tar.xz
+Source0:        ca-certificates-%{version}.tar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            https://github.com/openSUSE/ca-certificates
 #
@@ -76,17 +76,10 @@ install -d -m 555 %{buildroot}/var/lib/ca-certificates/openssl
 install -d -m 755 %{buildroot}/%{_prefix}/lib/systemd/system
 ln -s ../../var/lib/ca-certificates/pem %{buildroot}%{sslcerts}
 %if %{with cabundle}
-install -D -m 644 /dev/null %{buildroot}/%{cabundle}
+install -D -m 444 /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
-
-# 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
+install -D -m 444 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
 
 %pre
 %service_add_pre ca-certificates.path ca-certificates.service
@@ -127,7 +120,7 @@ rm -rf %{buildroot}
 %dir /etc/ca-certificates/update.d
 %dir %{_prefix}/lib/ca-certificates
 %dir %{_prefix}/lib/ca-certificates/update.d
- %{_prefix}/lib/systemd/system/*
+%{_prefix}/lib/systemd/system/*
 %dir /var/lib/ca-certificates
 %dir /var/lib/ca-certificates/pem
 %dir /var/lib/ca-certificates/openssl