up to 20160104

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index 2e9c4c72120204d8ce13edd9709482d92bdf22ea..8d25f7c38d5c1ffc6ecdba82546232bb1445f8a4 100644 (file)
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -37,14 +37,6 @@
    if test -L "$PEM"
    then
      rm -f "$PEM"
-@@ -90,6 +90,7 @@ if [ "$fresh" = 1 ]; then
-   do
-     case $(readlink "$symlink") in
-       $CERTSDIR*) rm -f "$symlink";;
-+      $LOCALCERTSDIR*) rm -f "$symlink";;
-     esac
-   done
-   find . -type l -print | while read symlink
 @@ -111,24 +111,18 @@
  
  sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt

diff --git a/ca-certificates-more-certs.patch b/ca-certificates-more-certs.patch
index 6db7b2bdd9f18f01fd8eda726ea540033440ee51..3130e9ccf7eebaf0bdeb7d490ea87b5dfc7acb52 100644 (file)
--- a/ca-certificates-more-certs.patch
+++ b/ca-certificates-more-certs.patch
@@ -1,11 +1,11 @@
---- ca-certificates-20140223/Makefile~ 2014-03-13 14:43:00.000000000 +0200
-+++ ca-certificates-20140223/Makefile  2014-03-14 12:54:53.792082826 +0200
+--- ca-certificates-20160104/Makefile~ 2015-12-20 11:49:23.000000000 +0200
++++ ca-certificates-20160104/Makefile  2016-01-18 14:57:26.210501084 +0200
 @@ -3,7 +3,7 @@
  #
  
  CERTSDIR = /usr/share/ca-certificates
--SUBDIRS = mozilla spi-inc.org
-+SUBDIRS = mozilla spi-inc.org thawte certum terena esteid
+-SUBDIRS = mozilla
++SUBDIRS = mozilla thawte certum terena esteid
  
  all:
        for dir in $(SUBDIRS); do \

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 64bf18aeb806208d0ca6001a6272ad0940fbf87d..8de9b295b322fb79f808f24edb4c34b9a54f763f 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -9,12 +9,12 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20150426
-Release:       2
+Version:       20160104
+Release:       1
 License:       GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
-# Source0-md5: 717455f13fb31fd014a11a468ea3895d
+# Source0-md5: d9665a83d0d3ef8176a38e6aa20458e9
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -134,7 +134,8 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q
+%setup -qc
+mv %{name}/* .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1