From 73f9d115e69ab000a2fa4fadd3b4bf31f4c94534 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 25 Jul 2012 17:23:19 +0000 Subject: merge patches from package repository: fix %rename macro --- build.macros.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.macros.in') diff --git a/build.macros.in b/build.macros.in index 9b1bb20..d90e846 100644 --- a/build.macros.in +++ b/build.macros.in @@ -380,8 +380,8 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o # Macro from conectiva %rename() \ -Obsoletes: %{1} < %{version}-%{release} \ -Provides: %{1} = %{version}-%{release} +Obsoletes: %{1} <= %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} \ +Provides: %{1} = %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} # Shorthand for %{defined with_...} # macros provided by rpm 4.4, but buggy :( -- cgit v1.2.1