Author: glen Date: Sun Aug 7 10:38:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.615: mksh-40b-1 (/bin/sh on carme) seems to keep set -x, which previously
was reset to set +x, and that is is too noisy, so set +x when not in -debug
build
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.295 -> 1.296) , rpm.macros (1.615 -> 1.616)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.295
packages/rpm-build-macros/rpm-build-macros.spec:1.296
--- packages/rpm-build-macros/rpm-build-macros.spec:1.295 Sat Jul 30
15:30:18 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec Sun Aug 7 12:38:43 2011
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.615
+%define rpm_macros_rev 1.616
%define find_lang_rev 1.34
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.296 2011/08/07 10:38:43 glen
+- 1.615: mksh-40b-1 (/bin/sh on carme) seems to keep set -x, which previously
was reset to set +x, and that is is too noisy, so set +x when not in -debug
build
+
Revision 1.295 2011/07/30 13:30:18 glen
- 1.615: symlinks-to-manlinks: handle links to different man sections
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.615
packages/rpm-build-macros/rpm.macros:1.616
--- packages/rpm-build-macros/rpm.macros:1.615 Sat Jul 30 15:29:45 2011
+++ packages/rpm-build-macros/rpm.macros Sun Aug 7 12:38:43 2011
@@ -552,6 +552,7 @@
#
%__spec_install_post_strip {%{!?debug: \
%{!?no_install_post_strip:__spec_install_post_strip() { \
+%{!?debug:set +x}; \
if [ -d "$RPM_BUILD_ROOT" ]; then \
if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type
f -print); \
@@ -622,6 +623,7 @@
#
%__spec_install_post_chrpath {%{!?debug: \
%{!?no_install_post_chrpath: __spec_install_post_chrpath() { \
+%{!?debug:set +x}; \
if [ -d "$RPM_BUILD_ROOT" ]; then \
files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" !
-regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*/lib/modules/.*" ! -regex
".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautochrpath:! -regex
"%{_noautochrpath}"}`; \
if [ -n "$files" ]; then \
@@ -674,6 +676,7 @@
#
%__spec_install_post_check_so { \
__spec_install_post_check_so() { \
+%{!?debug:set +x}; \
fail=0; \
printf "Searching for shared objects with unresolved symbols..."; \
for f in $(find $RPM_BUILD_ROOT -type f -name '*.so.*' -print); do \
@@ -691,6 +694,7 @@
#%no_install_post_compress_modules 1
%__spec_install_post_compress_modules { \
%{!?no_install_post_compress_modules: __spec_install_post_compress_modules() {
\
+%{!?debug:set +x}; \
if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f
-print); \
if [ "$q" ]; then \
@@ -1003,6 +1007,7 @@
# Hardlink binary identical .pyc and .pyo files
%__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; \
if [ -d "$RPM_BUILD_ROOT" ]; then \
find "$RPM_BUILD_ROOT" -name '*.pyc' > __rpm_pyc; \
@@ -1689,6 +1694,7 @@
%define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
\
__install_kernel_modules() {
\
+%{!?debug:set +x}; \
local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up:
up}}%{!?with_dist_kernel: nondist}' \
\
for MODULE in {%{-m*},}; do
\
@@ -1869,6 +1875,7 @@
%py_lint() \
__py_lint() { \
+%{!?debug:set +x}; \
find "$@" -type f -name '*.py' | python -c ' \
import sys \
import compiler \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.295&r2=1.296&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.615&r2=1.616&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
