From 89c3f91ffff6eb5cb5f8825e5856e293881ece67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 13 Oct 2020 08:22:01 +0200 Subject: [PATCH] - clean up patches, rpm4 uses fuzz=0 for patching --- python-internal-build.patch | 2 +- rpm-changelog_order_check_nonfatal.patch | 2 +- rpm-man_pl.patch | 8 ++++---- rpm-perl-macros.patch | 10 +++++----- rpm-perl-magic.patch | 3 +-- rpm-perl_req-INC_dirs.patch | 3 ++- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python-internal-build.patch b/python-internal-build.patch index b339769..ce66a35 100644 --- a/python-internal-build.patch +++ b/python-internal-build.patch @@ -21,7 +21,7 @@ rpmmod = Extension('rpm._rpm', sources = ['header-py.c', 'rpmds-py.c', 'rpmfd-py.c', @@ -33,11 +24,9 @@ - 'rpmte-py.c', 'rpmts-py.c', + 'rpmte-py.c', 'rpmts-py.c', 'rpmver-py.c', 'spec-py.c', 'rpmmodule.c'], - include_dirs = pkgconfig('--cflags'), diff --git a/rpm-changelog_order_check_nonfatal.patch b/rpm-changelog_order_check_nonfatal.patch index 4fca83f..ae75fa4 100644 --- a/rpm-changelog_order_check_nonfatal.patch +++ b/rpm-changelog_order_check_nonfatal.patch @@ -1,7 +1,7 @@ --- rpm-4.5/build/parseChangelog.c.orig 2012-07-24 14:46:12.856158625 +0200 +++ rpm-4.5/build/parseChangelog.c 2012-07-24 14:47:55.293158624 +0200 @@ -181,9 +181,8 @@ - goto exit; + trimtime = firstTime - trimage; } if (lastTime && lastTime < time) { - rpmlog(RPMLOG_ERR, diff --git a/rpm-man_pl.patch b/rpm-man_pl.patch index db61324..c9e03ea 100644 --- a/rpm-man_pl.patch +++ b/rpm-man_pl.patch @@ -1,7 +1,7 @@ ---- rpm/doc/pl/rpm.8~ 2007-11-24 23:21:26.000000000 +0100 -+++ rpm/doc/pl/rpm.8 2007-11-24 23:21:26.000000000 +0100 -@@ -325,6 +325,7 @@ - Instaluje pakiety nawet je¶li niektóre z nich s± ju¿ zainstalowane na tym +--- rpm-4.16.0/doc/pl/rpm.8.orig 2020-05-28 12:04:25.022136604 +0200 ++++ rpm-4.16.0/doc/pl/rpm.8 2020-10-13 08:06:11.442087617 +0200 +@@ -318,6 +318,7 @@ + Instaluje pakiety nawet jeśli niektóre z nich są już zainstalowane na tym systemie. .TP +\fB--test\fR diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch index a486444..1d09638 100644 --- a/rpm-perl-macros.patch +++ b/rpm-perl-macros.patch @@ -11,7 +11,7 @@ python/Makefile --- rpm-5.3.1/scripts/perl.req.wiget 2008-10-26 10:50:53.000000000 +0100 +++ rpm-5.3.1/scripts/perl.req 2010-05-30 16:35:36.999438206 +0200 -@@ -41,7 +41,11 @@ +@@ -45,7 +45,11 @@ if ("@ARGV") { foreach (@ARGV) { @@ -24,7 +24,7 @@ } } else { -@@ -49,7 +53,11 @@ if ("@ARGV") { +@@ -53,7 +57,11 @@ # contents of the file. foreach (<>) { @@ -37,7 +37,7 @@ } } -@@ -215,19 +223,41 @@ sub process_file { +@@ -261,19 +269,41 @@ $module =~ s/\(\s*\)$//; @@ -89,8 +89,8 @@ }; -@@ -244,7 +274,31 @@ sub process_file { - # will be included with the name sys/systeminfo.ph so only use the +@@ -290,7 +320,31 @@ + # will be included with the name sys/systeminfo.ph so only use the # basename of *.ph files - ($module =~ m/\.ph$/) && next; diff --git a/rpm-perl-magic.patch b/rpm-perl-magic.patch index 29e27a2..1faacf3 100644 --- a/rpm-perl-magic.patch +++ b/rpm-perl-magic.patch @@ -1,7 +1,6 @@ --- rpm/build/rpmfc.c.orig 2014-10-07 15:53:03.185631053 +0100 +++ rpm/build/rpmfc.c 2014-10-07 16:02:32.487591097 +0100 -@@ -593,7 +593,8 @@ - { "troff or preprocessor input", RPMFC_INCLUDE }, +@@ -593,6 +593,7 @@ { "GNU Info", RPMFC_INCLUDE }, { "perl ", RPMFC_INCLUDE }, diff --git a/rpm-perl_req-INC_dirs.patch b/rpm-perl_req-INC_dirs.patch index f6276f4..f15d401 100644 --- a/rpm-perl_req-INC_dirs.patch +++ b/rpm-perl_req-INC_dirs.patch @@ -1,6 +1,6 @@ --- scripts/perl.req~ 2004-04-16 13:27:10.000000000 +0200 +++ scripts/perl.req 2004-04-26 23:54:42.128568344 +0200 -@@ -39,8 +39,17 @@ +@@ -39,9 +39,18 @@ eval { require version; $HAVE_VERSION = 1; }; @@ -20,6 +20,7 @@ + if (m=/usr/(sbin|bin|lib|lib64|libx32|share|X11R6/(lib|lib64|libx32|bin))/=) { if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { process_file($_) if -f; + } @@ -53,7 +64,9 @@ foreach $perlver (sort keys %perlreq) { print "perl >= $perlver\n"; -- 2.44.0