- 1.583

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 14f9d887eb6cb2e1de9c3ada443779cf0030eef5..047c9f6ebfcb4c3f75389ef610de031ca0d858bf 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -639,15 +639,17 @@ fi; }; __spec_install_post_chrpath } } }
 # Find all shared object files with unresolved symbols. Warn
 # and terminate if any found (termination can be turned off by define).
 #%no_install_post_check_so 1
+#%skip_post_check_so libwithunresolvedok.so.*
 %__spec_install_post_check_so { \
  __spec_install_post_check_so() { \
     fail=0; \
     printf "Searching for shared objects with unresolved symbols..."; \
     for f in $(find $RPM_BUILD_ROOT -type f -name '*.so.*' -print); do \
+           %{?skip_post_check_so:echo %{skip_post_check_so} | LC_ALL=C awk '{ gsub(/[ \t]+/,"\n"); print }' | LC_ALL=C awk -v "file=$f" 'file ~ "(^|/)" $0 "$" { exit(1) }' || continue ;} \
         LC_ALL=C objdump -T $f 2> /dev/null | LC_ALL=C awk -v "file=$f" 'BEGIN { found=0; skip["program_name"]=1; symbols = "" } /^[0-9a-z]+ +D +\*UND\*/ { if ($NF in skip) { next; }; found = 1; symbols = symbols "\n\t" $NF } END { if (found) { print "\nUnresolved symbols found in: " file symbols; exit(1); } } ' || fail=1 ; \
     done ; \
     echo " DONE"; \
-    %{!?no_install_post_check_so:[ $fail -eq 1 ] && : || :;} \
+    %{!?no_install_post_check_so:return $fail;} \
 }; __spec_install_post_check_so }}
 
 #-----------------------------------------------------------------
@@ -828,13 +830,13 @@ fi; \
 %requires_php_extension %{__php_api_requires modules_api php_api_version} \
 %{__php_api_requires zend_module_api} \
 %{__php_api_requires -v %php_major_version debug php_debug} \
-%{__php_api_requires -v %php_major_version thread-safety zend_zts}
+%{__php_api_requires -v %php_major_version thread-safety _zend_zts}
 
 # for zend extensions
 %requires_zend_extension %{__php_api_requires zend_module_api} \
 %{__php_api_requires zend_extension_api} \
 %{__php_api_requires -v %php_major_version debug php_debug} \
-%{__php_api_requires -v %php_major_version thread-safety zend_zts}
+%{__php_api_requires -v %php_major_version thread-safety _zend_zts}
 
 # for php pdo modules (php-pecl-PDO_*)
 %requires_php_pdo_module %{__php_api_requires PDO_API php_pdo_api_version}
@@ -1360,7 +1362,7 @@ echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 #      %%pear_package_setup ...
 #
 # -a #   - also unpack SOURCE#. for PEAR bootstrapping
-# -n FMT - create builddir with FMT, instead of default %%{_pearname}-%%{version}
+# -n FMT - create builddir with FMT, instead of default %%{pearname}-%%{version}
 # -z     - unpack pear package and let pear use package.xml (not tarball) for install. for PEAR bootstrapping
 # -D     - pass -D to %setup (so the build dir is not removed)
 # -c     - register channel from local channel.xml file
@@ -1422,7 +1424,7 @@ fi \
 # as it's displayed to user after package install. and adding additional gzip
 # dep is just waste ;)
 %pear_package_setup(a:d:n:zDc:) \
-%define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
+%define srcdir %{-n*}%{!-n:%{?_pearname}%{!?_pearname:%{pearname}}-%{version}} \
 %define builddir %{_builddir}/%{srcdir} \
 %setup -q -c -T %{-D:-D} -n %{srcdir} \
 %{-z:%{__tar} zxf %{S:0}; %{-a:%{__tar} zxf %{S:%{-a*}}}} \