- up to 20110421

Changed files:
    ca-certificates-more-certs.patch -> 1.5
    ca-certificates-mozilla.patch -> 1.2
    ca-certificates.spec -> 1.42

diff --git a/ca-certificates-more-certs.patch b/ca-certificates-more-certs.patch
index d281bc2a3b0a518d05bbec2db19409d6a42d6d31..06a40746e1617e2b91d691895ad87ed7cb3ab356 100644 (file)
--- a/ca-certificates-more-certs.patch
+++ b/ca-certificates-more-certs.patch
@@ -4,8 +4,8 @@
  #
  
  CERTSDIR = /usr/share/ca-certificates
--SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
-+SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr thawte certum terena esteid
+-SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl gouv.fr
++SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl gouv.fr thawte certum terena esteid
  
  all:
        for dir in $(SUBDIRS); do \

diff --git a/ca-certificates-mozilla.patch b/ca-certificates-mozilla.patch
index 1495654aaf5445bc534a3cd84b964a77118fc2dd..624cbfb2259d4337d12973205e53d1649fd50d82 100644 (file)
--- a/ca-certificates-mozilla.patch
+++ b/ca-certificates-mozilla.patch
@@ -1,14 +1,5 @@
 --- ca-certificates-20090814/mozilla/certdata.txt.old  2009-06-24 12:32:03.000000000 +0200
 +++ ca-certificates-20090814/mozilla/certdata.txt      2009-08-31 20:28:47.000000000 +0200
-@@ -34,7 +34,7 @@
- # the terms of any one of the MPL, the GPL or the LGPL.
- #
- # ***** END LICENSE BLOCK *****
--CVS_ID "@(#) $RCSfile$ $Revision$ $Date$"
-+CVS_ID "@(#) $RCSfile$ $Revision$ $Date$"
- 
- #
- # certdata.txt
 @@ -14086,7 +14086,7 @@
  END
  CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR

diff --git a/ca-certificates.spec b/ca-certificates.spec
index ae2e592dc58314d0dd6bd7e47e57fdde22abd407..0edc38a5dcb4ba194efe1f2511f82d411cd21d82 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -7,12 +7,12 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20090814
-Release:       14
+Version:       20110421
+Release:       1
 License:       distributable
 Group:         Libraries
-Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}+nmu3.tar.gz
-# Source0-md5: 578be1c5a459cea3b243777c08610727
+Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
+# Source0-md5: 59edcd927a76cf78ec5bb43f248ea68d
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: a3709cc0279ef3fca4f86ea775066b18
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -107,7 +107,7 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q -n %{name}-%{version}+nmu3
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1