diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:23:19 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:23:19 +0000 |
| commit | 73f9d115e69ab000a2fa4fadd3b4bf31f4c94534 (patch) | |
| tree | 60a0f031b37d1bb5b3b8a418077092bf2e57bb0c | |
| parent | 3ce36b2342f95a3cdce2e1ebdd3755548bbd62e4 (diff) | |
| download | rpm-setup-73f9d115e69ab000a2fa4fadd3b4bf31f4c94534.tar rpm-setup-73f9d115e69ab000a2fa4fadd3b4bf31f4c94534.tar.gz rpm-setup-73f9d115e69ab000a2fa4fadd3b4bf31f4c94534.tar.bz2 rpm-setup-73f9d115e69ab000a2fa4fadd3b4bf31f4c94534.tar.xz rpm-setup-73f9d115e69ab000a2fa4fadd3b4bf31f4c94534.zip | |
merge patches from package repository: fix %rename macro
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | build.macros.in | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ - merge patches from package repository: o fix build with rpm-4.9+ + o fix %rename macro Version 1.148 - 25 Jul 2012, by Thierry Vignaud - drop automatically generated dependencies on interpreters we either don't 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 :( |