- rel 5 auto/th/ca-certificates-20090814-5
authorJan Rękorajski <baggins@pld-linux.org>
Wed, 24 Feb 2010 11:53:30 +0000 (11:53 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- certificate file may not end with newline, take that into account when
  generating ca-certificates.crt in install

Changed files:
    ca-certificates.spec -> 1.28

ca-certificates.spec

index 9021b2c33ec414af94a943836c333bd7a08c2803..ae29c860a240412482fee0fccd36b31e9a9ff5a1 100644 (file)
@@ -4,7 +4,7 @@ Summary:        Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
 Version:       20090814
-Release:       4
+Release:       5
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -126,10 +126,10 @@ cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-(
-cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
-find . -name '*.crt' -print0 | xargs -0 cat
-) > $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' | while read cert ; do
+       cat "$cert" >> $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+       echo >>$RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
This page took 0.036045 seconds and 4 git commands to generate.