From 63d9963ab88e9c7c176bc117419b5d0ce5e4aaea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 28 Jan 2010 15:13:54 +0000 Subject: [PATCH] - 1.531: add -n to %requires_releq_kernel* too Changed files: rpm-build-macros.spec -> 1.229 rpm.macros -> 1.531 --- rpm-build-macros.spec | 2 +- rpm.macros | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 05f87a5..3081dbc 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 1.530 +%define rpm_macros_rev 1.531 %define find_lang_rev 1.32 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 ccb48b6..9240350 100644 --- a/rpm.macros +++ b/rpm.macros @@ -367,9 +367,9 @@ CXXFLAGS="%{rpmcxxflags}" \ %releq_kernel_smp(n:) %{expand:%%global releq_kernel_smp %(R=$(LC_ALL=C rpm -q --qf '%{N}%{?-n:-%{-n*}}-smp = %|E?{%{E}:}|%{V}-%{R}' -f %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | grep -v 'is not' | sed -e 's:-headers::;s:-config::'); echo ${R:-ERROR})}%releq_kernel_smp # -s post to generate Requires(post) dependency -%requires_releq_kernel(s:) Requires%{-s:(%{-s*})}: %releq_kernel -%requires_releq_kernel_up(s:) Requires%{-s:(%{-s*})}: %releq_kernel_up -%requires_releq_kernel_smp(s:) Requires%{-s:(%{-s*})}: %releq_kernel_smp +%requires_releq_kernel(s:n:) Requires%{-s:(%{-s*})}: %releq_kernel +%requires_releq_kernel_up(s:n:) Requires%{-s:(%{-s*})}: %releq_kernel_up +%requires_releq_kernel_smp(s:n:) Requires%{-s:(%{-s*})}: %releq_kernel_smp # Requires name = version-release %requires_releq() %{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}} -- 2.44.0