From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 24 Feb 2010 11:53:30 +0000 (+0000)
Subject: - rel 5
X-Git-Tag: auto/th/ca-certificates-20090814-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=408dc5100be19eee96298c9cfd9975842db86b42

- rel 5
- 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
---

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 9021b2c..ae29c86 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -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