X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=ae29c860a240412482fee0fccd36b31e9a9ff5a1;hp=0474ac7f5344db908e81a109417f3da84e5867a4;hb=d9b817d8c01bddfe211e78a7dc57829dd6dbd10f;hpb=65bcbc858805f27ff8cbaaa6311e97bf6f1e5e61

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 0474ac7..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:	1
+Release:	5
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -39,10 +39,11 @@ Patch0:		%{name}-undebianize.patch
 Patch1:		%{name}-more-certs.patch
 Patch2:		%{name}-etc-certs.patch
 Patch3:		%{name}-c_rehash.sh.patch
+Patch4:		%{name}-endline.patch
 URL:		http://www.cacert.org/
-BuildRequires:	coreutils
 BuildRequires:	python
 BuildRequires:	python-modules
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Obsoletes:	certificates
 BuildArch:	noarch
@@ -76,6 +77,7 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
@@ -84,8 +86,7 @@ mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (
 
 find thawte/ -name *.pem | while read f ; do
 	ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
-	fff="thawte/$(basename "$ff" .pem).crt"
-	tr -d '\r' < "$f" > "$fff"
+	cp "$f" "thawte/$(basename "$ff" .pem).crt"
 done
 
 install -d certum
@@ -118,15 +119,17 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' -exec sed -i -e 's/\r$//' {} \;
+
 (
 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