From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 22 Feb 2018 12:18:17 +0000 (+0000)
Subject: - PLD merge (backport --nopretrans, --noposttrans options)
X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=9316bfb9ee5924edddf48d3a64b6832faf08d79d

- PLD merge (backport --nopretrans, --noposttrans options)
---

diff --git a/rpm.spec b/rpm.spec
index 3a56c79..0ba234f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -42,7 +42,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	80
+Release:	80.1
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -169,6 +169,7 @@ Patch108:	%{name}-changelog_order_check_nonfatal.patch
 Patch109:	%{name}-installplatform.patch
 Patch110:	%{name}-xz.patch
 Patch111:	%{name}-shrink.patch
+Patch112:	notrans.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -790,6 +791,7 @@ install %{SOURCE13} scripts/perl.prov
 %patch109 -p1
 %patch110 -p1
 %patch111 -p1
+%patch112 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -1173,7 +1175,7 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/RPM.pm
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/.packlist
-#%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
+%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.so
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/RPM.3pm
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,ja,pl}/man8/rpm{cache,graph}.8