packages: ca-certificates/ca-certificates.spec - rel 4 - convert newlines o...

[baggins]

Author: baggins                      Date: Tue Feb  9 14:38:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- convert newlines of all files from DOS to UNIX in install
- fix for missing newline at end of file

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

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.26 packages/ca-certificates/ca-certificates.spec:1.27
--- packages/ca-certificates/ca-certificates.spec:1.26	Tue Feb  9 15:16:16 2010
+++ packages/ca-certificates/ca-certificates.spec	Tue Feb  9 15:38:48 2010
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20090814
-Release:	3
+Release:	4
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -40,10 +40,11 @@
 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
@@ -77,6 +78,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
@@ -85,8 +87,7 @@
 
 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
@@ -119,6 +120,8 @@
 %{__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-
@@ -151,6 +154,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/02/09 14:38:48  baggins
+- rel 4
+- convert newlines of all files from DOS to UNIX in install
+- fix for missing newline at end of file
+
 Revision 1.26  2010/02/09 14:16:16  baggins
 - rel 3
 - make update-ca-certificates create bundle in proper place
================================================================

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