From f58a519511879538d3a39532404f28a5222eb8ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 13 Aug 2011 10:35:46 +0000 Subject: [PATCH] - fix syntax error when bulding with "-debug" Changed files: rpm-build-macros.spec -> 1.297 rpm.macros -> 1.617 --- rpm-build-macros.spec | 2 +- rpm.macros | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 0f6eb16..4c7072b 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 1.616 +%define rpm_macros_rev 1.617 %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 diff --git a/rpm.macros b/rpm.macros index 3443913..e9d596d 100644 --- a/rpm.macros +++ b/rpm.macros @@ -503,7 +503,7 @@ CXXFLAGS="%{rpmcxxflags}" \ #%no_install_post_compress_docs 1 %__spec_install_post_compress_docs { \ %{!?no_install_post_compress_docs:__spec_install_post_compress_docs() { \ - %{!?debug:set +x}; \ + %{!?debug:set +x;} \ for i in /usr/share/man /usr/X11R6/man; do \ if [ -d "$RPM_BUILD_ROOT$i" ]; then \ echo "Compress man pages: $i"; \ @@ -552,7 +552,7 @@ CXXFLAGS="%{rpmcxxflags}" \ # %__spec_install_post_strip {%{!?debug: \ %{!?no_install_post_strip:__spec_install_post_strip() { \ -%{!?debug:set +x}; \ +%{!?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); \ @@ -623,7 +623,7 @@ fi; }; __spec_install_post_strip } } } # %__spec_install_post_chrpath {%{!?debug: \ %{!?no_install_post_chrpath: __spec_install_post_chrpath() { \ -%{!?debug:set +x}; \ +%{!?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 \ @@ -676,7 +676,7 @@ fi; }; __spec_install_post_chrpath } } } # %__spec_install_post_check_so { \ __spec_install_post_check_so() { \ -%{!?debug:set +x}; \ +%{!?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 \ @@ -694,7 +694,7 @@ __spec_install_post_check_so() { \ #%no_install_post_compress_modules 1 %__spec_install_post_compress_modules { \ %{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \ -%{!?debug:set +x}; \ +%{!?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 \ @@ -1007,7 +1007,7 @@ fi \ # 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}; \ +%{!?debug:set +x;} \ local a b c=0 t=0; \ if [ -d "$RPM_BUILD_ROOT" ]; then \ find "$RPM_BUILD_ROOT" -name '*.pyc' > __rpm_pyc; \ @@ -1694,7 +1694,7 @@ compile %{*}\ %define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \ \ __install_kernel_modules() { \ -%{!?debug:set +x}; \ +%{!?debug:set +x;} \ local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \ \ for MODULE in {%{-m*},}; do \ @@ -1875,7 +1875,7 @@ io.open("/etc/shells", "w"):write(s)\ %py_lint() \ __py_lint() { \ -%{!?debug:set +x}; \ +%{!?debug:set +x;} \ find "$@" -type f -name '*.py' | python -c ' \ import sys \ import compiler \ -- 2.43.0