packages: ca-certificates/ca-certificates.spec - rel 5 - certificate file m...

[baggins]

Author: baggins                      Date: Wed Feb 24 11:53:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- certificate file may not end with newline, take that into account when
  generating ca-certificates.crt in install

---- Files affected:
packages/ca-certificates:
   ca-certificates.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.27 packages/ca-certificates/ca-certificates.spec:1.28
--- packages/ca-certificates/ca-certificates.spec:1.27	Tue Feb  9 15:38:48 2010
+++ packages/ca-certificates/ca-certificates.spec	Wed Feb 24 12:53:30 2010
@@ -5,7 +5,7 @@
 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
@@ -127,10 +127,10 @@
 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
@@ -154,6 +154,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/02/24 11:53:30  baggins
+- rel 5
+- certificate file may not end with newline, take that into account when
+  generating ca-certificates.crt in install
+
 Revision 1.27  2010/02/09 14:38:48  baggins
 - rel 4
 - convert newlines of all files from DOS to UNIX in install
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates.spec?r1=1.27&r2=1.28&f=u