Packman Build Service PMBS

Changes of Revision 3

boringssl.changes Changed

boringssl.spec Changed

@@ -147,13 +147,12 @@
 find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*%{_bindir}/env python.*|#!%{_bindir}/python3|' "{}" +
 find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*%{_bindir}/env bash|#!/bin/bash|' "{}" +
 
-# To avoid conflicts with openssl development files, change all includes from
-# openssl to boringssl.
-# BoringSSL headers provided by this pachage are installed in
-# /usr/include/boringssl for the same reason.
-find %{buildroot}%{_prefix}/src/boringssl/include/openssl -type f -exec sed -i 's/openssl/boringssl/' "{}" +
-
-find %{buildroot}%{_prefix}/src/boringssl/include/openssl -type f -execdir install -D -m0644 "{}" "%{buildroot}%{_includedir}/boringssl/{}" \;
+# Install headers into /usr/include/boringssl/openssl/ to avoid conflicts with openssl
+# development files, while allowing downstream packages to include them via -I/usr/include/boringssl
+mkdir -p %{buildroot}%{_includedir}/boringssl
+cp -R %{buildroot}%{src_install_dir}/include/openssl %{buildroot}%{_includedir}/boringssl/
+find %{buildroot}%{_includedir}/boringssl/openssl -type d -exec chmod 0755 "{}" +
+find %{buildroot}%{_includedir}/boringssl/openssl -type f -exec chmod 0644 "{}" +
 
 # Remove Go build utilities which cause debuginfo error:
 # dwz: ./usr/src/boringssl/crypto/err/err_data_generate.debug: Found compressed .debug_abbrev section, not attempting dwz compression