- fix %_target_platform macro in platform.in

diff --git a/rpm.spec b/rpm.spec
index d3ba0ad1597b6223336d255248513a5eb74480de..a0cfec4ab297b3519e6067f1f20074cac1de8e2a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.16.1.2
-Release:       8
+Release:       8.1
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base

diff --git a/x32.patch b/x32.patch
index 43b2f2b6df2904c8200ad07d06653bddf9ee523c..197f9055c45f8ab687e15c108d520ce6b503972f 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -132,7 +132,7 @@ diff -ur rpm-4.15.1.orig/platform.in rpm-4.15.1/platform.in
  %_os                  @RPMCANONOS@
  %_gnu                 @RPMRC_GNU@
 -%_target_platform     %{_target_cpu}-%{_vendor}-%{_target_os}
-+%_target_platform     @TARGETCPU@-%{_vendor}-%{_target_os}%{?_gnu}
++%_target_platform     @TARGETCPU@-%{_vendor}-%{_target_os}
  %optflags             @RPMRC_OPTFLAGS@
  
  %__isa_name           @ISANAME@