commit 5ed24c89dfdc7a137ae10bdb4113f187b3b65c1b
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 20 13:38:49 2013 +0300
py_postclean - do not use relative paths
somehow i686 builder fails with negative priority:
/tmp/B.53c70a4e-e1f2-4783-a355-9a2777bab4c6/BUILD/tmp/rpm-tmp.33435[258]:
can't create __rpm_pyc: No such file or directory
rpm-build-macros.spec | 2 +-
rpm.macros | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 496157b..a0094bc 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 2
+Release: 3
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index 3bcd3c5..de56584 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1077,9 +1077,9 @@ fi \
%__spec_install_post_py_hardlink {\
%{!?no_install_post_py_hardlink: __spec_install_post_py_hardlink() { \
%{!?debug:set +x;} \
-local a b c=0 t=0; \
+local a b c=0 t=0 pyc=%{tmpdir}/%{name}-%{version}-%{release}__rpm_pyc; \
if [ -d "$RPM_BUILD_ROOT" ]; then \
- find "$RPM_BUILD_ROOT" -name '*.pyc' > __rpm_pyc; \
+ find "$RPM_BUILD_ROOT" -name '*.pyc' > $pyc; \
while read a; do \
b="${a%.pyc}.pyo"; \
if cmp -s "$a" "$b"; then \
@@ -1087,9 +1087,9 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
c=$((c + 1)); \
fi; \
t=$((t + 1)); \
- done < __rpm_pyc; \
+ done < $pyc; \
[ $t -gt 0 ] && printf "Hardlink Python files: %d/%d files
hardlinked\n" $c $t; \
- rm -f __rpm_pyc; \
+ rm -f $pyc; \
fi; \
}; __spec_install_post_py_hardlink } }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/5ed24c89dfdc7a137ae10bdb4113f187b3b65c1b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
