[packages/rpm/rpm-4_5] backport --nopretrans, --noposttrans options
glen
glen at pld-linux.org
Tue Dec 27 08:24:59 CET 2016
commit e7d46cc05b752d15b172a79b68cc5d4ed1216187
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Dec 27 09:24:21 2016 +0200
backport --nopretrans, --noposttrans options
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-December/025259.html
notrans.patch | 37 +++++++++++++++++++++++++++++++++++++
rpm.spec | 4 +++-
2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 17beba5..dbb0ba6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -60,7 +60,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 70
+Release: 71
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -192,6 +192,7 @@ Patch105: %{name}-am.patch
Patch106: %{name}-automake_1.12.patch
Patch107: %{name}-debugedit-dwarf4.patch
Patch108: %{name}-changelog_order_check_nonfatal.patch
+Patch109: notrans.patch
URL: http://rpm5.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1.4
@@ -833,6 +834,7 @@ install %{SOURCE13} scripts/perl.prov
%patch106 -p1
%patch107 -p1
%patch108 -p1
+%patch109 -p1
mv -f po/{sr,sr at Latn}.po
rm -rf sqlite zlib popt
diff --git a/notrans.patch b/notrans.patch
new file mode 100644
index 0000000..5f2b92d
--- /dev/null
+++ b/notrans.patch
@@ -0,0 +1,37 @@
+backport --nopretrans, --noposttrans options
+
+--- rpm-4.5/lib/poptI.c~ 2016-12-26 23:05:38.000000000 +0200
++++ rpm-4.5/lib/poptI.c 2016-12-26 23:07:43.315470552 +0200
+@@ -303,6 +303,10 @@
+ { "noscripts", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS,
+ N_("do not execute package scriptlet(s)"), NULL },
+
++ { "nopretrans", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
++ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPRETRANS,
++ N_("do not execute %%pretrans scriptlet (if any)"), NULL },
++
+ { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
+ RPMTRANS_FLAG_NOPRE,
+ N_("do not execute %%pre scriptlet (if any)"), NULL },
+@@ -315,6 +319,9 @@
+ { "nopostun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
+ RPMTRANS_FLAG_NOPOSTUN,
+ N_("do not execute %%postun scriptlet (if any)"), NULL },
++ { "noposttrans", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
++ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPOSTTRANS,
++ N_("do not execute %%postrans scriptlet (if any)"), NULL },
+
+ { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NODIGEST,
+ N_("don't verify package digest(s)"), NULL },
+--- rpm-4.5/lib/rpmlib.h~ 2016-12-26 23:24:14.000000000 +0200
++++ rpm-4.5/lib/rpmlib.h 2016-12-26 23:27:26.960081925 +0200
+@@ -943,7 +943,8 @@
+
+ /* 26 unused */
+ RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */
+- /* 28-29 unused */
++ RPMTRANS_FLAG_NOPRETRANS = (1 << 28), /*!< from --nopretrans */
++ RPMTRANS_FLAG_NOPOSTTRANS = (1 << 29), /*!< from --noposttrans */
+ RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */
+ /* 31 unused */
+ } rpmtransFlags;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/e7d46cc05b752d15b172a79b68cc5d4ed1216187
More information about the pld-cvs-commit
mailing list