From 46761559371d6e5e68c23c17286f4883562d0579 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 27 Feb 2021 14:00:47 +0100 Subject: [PATCH] - PLD merge --- build-locale.patch | 15 + perl.prov | 3 +- pl-po.patch | 11 + rpm-popt-aliases.patch | 9 +- rpm.groups | 1064 ++++++++++++++++++++-------------------- rpm.spec | 16 +- skip-symlinks.patch | 11 + 7 files changed, 593 insertions(+), 536 deletions(-) create mode 100644 build-locale.patch create mode 100644 pl-po.patch create mode 100644 skip-symlinks.patch diff --git a/build-locale.patch b/build-locale.patch new file mode 100644 index 0000000..49a846b --- /dev/null +++ b/build-locale.patch @@ -0,0 +1,15 @@ +--- rpm-4.16.1.2.org/macros.in 2021-02-25 08:15:48.438647368 +0100 ++++ rpm-4.16.1.2/macros.in 2021-02-25 08:18:39.103948354 +0100 +@@ -818,9 +818,11 @@ package or when debugging this package.\ + RPM_PACKAGE_VERSION=\"%{VERSION}\"\ + RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\ + export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\ ++ LC_ALL=C\ ++ export LC_ALL\ + LANG=C\ + export LANG\ +- unset CDPATH DISPLAY ||:\ ++ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT||:\ + %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\ + export RPM_BUILD_ROOT}\ + %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ diff --git a/perl.prov b/perl.prov index a494480..6a66f76 100644 --- a/perl.prov +++ b/perl.prov @@ -105,7 +105,8 @@ sub process_file { ( $version = $self->{safe}->reval($_) ) =~ s/^\s+|alpha|beta|\s+$//g; if ( defined $version && length $version - && $version =~ /[^\d\._abcdefgh]/ ) + && ($version =~ /[^\d\._abcdefgh]/ + || $version =~ /^[^\d]*$/ )) { warn "$0: weird version number in $file: [$version]\n"; $version = ''; diff --git a/pl-po.patch b/pl-po.patch new file mode 100644 index 0000000..08e2818 --- /dev/null +++ b/pl-po.patch @@ -0,0 +1,11 @@ +--- rpm-4.16.1.2/po/pl.po~ 2021-02-19 09:16:53.000000000 +0100 ++++ rpm-4.16.1.2/po/pl.po 2021-02-23 10:46:24.003601872 +0100 +@@ -37,7 +37,7 @@ + #: cliutils.c:27 lib/poptALL.c:61 + #, c-format + msgid "RPM version %s\n" +-msgstr "RPM %s\n" ++msgstr "RPM wersja %s\n" + + #: cliutils.c:32 + #, c-format diff --git a/rpm-popt-aliases.patch b/rpm-popt-aliases.patch index a6c5451..61230b0 100644 --- a/rpm-popt-aliases.patch +++ b/rpm-popt-aliases.patch @@ -1,6 +1,6 @@ --- rpm-4.4.9/rpmpopt.in 2008-03-24 22:09:33.709972364 +0200 +++ rpm-4.4.9/rpmpopt.in 2008-04-04 18:51:45.658923774 +0300 -@@ -240,5 +249,35 @@ +@@ -240,5 +249,42 @@ --POPTdesc=$"trace macro expansion" rpmspec alias --nodebuginfo --define 'debug_package %{nil}' \ --POPTdesc=$"do not generate debuginfo for this package" @@ -16,6 +16,13 @@ +rpmbuild exec --bcond find-spec-bcond \ + --POPTdesc=$"find all --with/--without values" + ++rpm alias --with --define "_with_!#:+ --with-!#:+" \ ++ --POPTdesc=$"enable configure