[php-google-apiclient] fix CA trust bundle location for Curl as well as Stream

[Adam Williamson]

commit 7803315c136b59c9600df4286c66f097aaaf8a24
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Nov 7 21:31:29 2014 -0800

    fix CA trust bundle location for Curl as well as Stream

 php-google-apiclient.spec |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/php-google-apiclient.spec b/php-google-apiclient.spec
index 4a6e68f..db5121e 100644
--- a/php-google-apiclient.spec
+++ b/php-google-apiclient.spec
@@ -9,7 +9,7 @@
 
 Name:          php-google-apiclient
 Version:       %{github_version}
-Release:       0.1%{?github_release}%{?dist}
+Release:       0.2%{?github_release}%{?dist}
 Summary:       Client library for Google APIs
 
 Group:         Development/Libraries
@@ -62,10 +62,11 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
-# Remove bundled CA cert
+# Replace bundled CA cert trust list with our systemwide one. This location
+# should work for EL6/7 and all supported Fedoras.
 rm -f src/Google/IO/cacerts.pem
-sed "s#dirname(__FILE__)\s*.\s*'/cacerts.pem'#'%{_sysconfdir}/pki/tls/cert.pem'#" \
-    -i src/Google/IO/Stream.php
+sed "s#dirname(__FILE__)\s*.\s*'/cacerts.pem'#'%{_sysconfdir}/pki/tls/certs/ca-bundle.crt'#" \
+    -i src/Google/IO/Stream.php src/Google/IO/Curl.php
 
 # Update examples' include path
 sed -i 's#../src#%{_datadir}/php#' examples/*.php
@@ -100,8 +101,8 @@ cd tests
 %{_bindir}/phpunit -d date.timezone="UTC" .
 
 # Ensure unbundled CA cert is referenced
-grep '%{_sysconfdir}/pki/tls/cert.pem' --quiet \
-    %{buildroot}%{_datadir}/php/Google/IO/Stream.php
+grep '%{_sysconfdir}/pki/tls/certs/ca-bundle.crt' --quiet \
+    %{buildroot}%{_datadir}/php/Google/IO/{Curl,Stream}.php
 
 
 %files
@@ -113,6 +114,12 @@ grep '%{_sysconfdir}/pki/tls/cert.pem' --quiet \
 
 
 %changelog
+* Fri Nov 07 2014 Adam Williamson <awilliam at redhat.com> - 1.0.6-0.2.beta
+- apply CA trust store path substitution to Curl as well as Stream
+
+* Fri Nov 07 2014 Adam Williamson <awilliam at redhat.com> - 1.0.6-0.1.beta
+- new upstream release 1.0.6-beta
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-0.3.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild