[packages/rpm-build-macros] - 1.739; don't match libx32 and don't try to strip guile 2.2 go files (which are ELF but not strippa

[arekm]

commit a5ccf93608d6c6f7abffb3117cb4dfe250b78b42
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Sat Mar 9 19:59:50 2019 +0100

    - 1.739; don't match libx32 and don't try to strip guile 2.2 go files 
(which are ELF but not strippable)

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 5a4b867..d4df931 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.738
+%define                rpm_macros_rev  1.739
 %define                find_lang_rev   1.40
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index ae0c390..ae88b38 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -625,7 +625,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                        echo "DONE"; \
                fi; \
        fi; \
-       filelist=$(find $RPM_BUILD_ROOT -type f ! -regex 
".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*/lib/modules/.*" ! -regex 
".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex 
"%{_noautostrip}"} %{?_autostripall:! -regex "%{_autostripall}"} 
%{?_autostripunneeded:! -regex "%{_autostripunneeded}"} %{?_autostripdebug:! 
-regex "%{_autostripdebug}"}); \
+       filelist=$(find $RPM_BUILD_ROOT -type f ! -regex 
".*/usr/lib[x0-9]*/debug/.*\.debug" ! -regex "/usr/lib[x0-9]*/guile/.*\.go" ! 
-regex ".*/lib/modules/.*" ! -regex ".*%{_docdir}/.*" ! -regex 
".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"} 
%{?_autostripall:! -regex "%{_autostripall}"} %{?_autostripunneeded:! -regex 
"%{_autostripunneeded}"} %{?_autostripdebug:! -regex "%{_autostripdebug}"}); \
        if [ -n "$filelist" ]; then \
                filetypes=`echo "$filelist" | xargs -r -d'\\n' file`; \
                elfexelist=`echo "$filetypes" | awk -F: '/ELF.*executable/ 
{print $1}'`; \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/a5ccf93608d6c6f7abffb3117cb4dfe250b78b42

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit