rpms/ca-certificates/devel ca-certificates.spec,1.10,1.11

[jorton]

Author: jorton

Update of /cvs/extras/rpms/ca-certificates/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12780

Modified Files:
	ca-certificates.spec 
Log Message:
- fix install



Index: ca-certificates.spec
===================================================================
RCS file: /cvs/extras/rpms/ca-certificates/devel/ca-certificates.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ca-certificates.spec	15 Jan 2010 20:22:01 -0000	1.10
+++ ca-certificates.spec	15 Jan 2010 20:48:32 -0000	1.11
@@ -50,7 +50,8 @@ EOF
  ) > ca-bundle.crt
 popd
 pushd %{name}/java
- %{__perl} %{SOURCE2} %{_bindir}/keytool ../certs/ca-bundle.crt
+ test -s ../ca-bundle.crt || exit 1
+ %{__perl} %{SOURCE2} %{_bindir}/keytool ../ca-bundle.crt
  touch -r %{SOURCE0} cacerts
 popd
 
@@ -59,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{pkidir}/tls/certs,%{pkidir}/java}
 
-install -p -m 644 ca-bundle.crt $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt
+install -p -m 644 %{name}/ca-bundle.crt $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt
 ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem
 touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt