From c1247bc7c65e7ce06927e00778672f56e79542e8 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 1 Feb 2018 13:36:55 +0200 Subject: [PATCH] Rebase to 4.14.1 --- .gitignore | 1 + ...assume-per-user-groups-in-test-suite.patch | 70 ------------------- rpm.spec | 14 ++-- sources | 2 +- 4 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 0001-Don-t-assume-per-user-groups-in-test-suite.patch diff --git a/.gitignore b/.gitignore index ea2c300..0a9907a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /rpm-4.14.0-rc1.tar.bz2 /rpm-4.14.0-rc2.tar.bz2 /rpm-4.14.0.tar.bz2 +/rpm-4.14.1.tar.bz2 diff --git a/0001-Don-t-assume-per-user-groups-in-test-suite.patch b/0001-Don-t-assume-per-user-groups-in-test-suite.patch deleted file mode 100644 index 1c8e53f..0000000 --- a/0001-Don-t-assume-per-user-groups-in-test-suite.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 92b718bb0e98ecaea6d4229eab9ef3bc0220d9c2 Mon Sep 17 00:00:00 2001 -Message-Id: <92b718bb0e98ecaea6d4229eab9ef3bc0220d9c2.1507815046.git.pmatilai@redhat.com> -From: Panu Matilainen -Date: Thu, 12 Oct 2017 15:51:26 +0300 -Subject: [PATCH] Don't assume per-user groups in test-suite - -The tests from commits f2d3be2a8741234faaa96f5fd05fdfdc75779a79 and -c815822c8bdb138066ff58c624ae83e3a12ebfa9 assume per-user groups, -but this is not a generally valid assumption and causes unnecessary -bogus failures in the test-suite in some setups (eg mock) ---- - tests/data/SPECS/replacetest.spec | 3 ++- - tests/rpmreplace.at | 2 ++ - tests/rpmverify.at | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/data/SPECS/replacetest.spec b/tests/data/SPECS/replacetest.spec -index c764adc27..54974567b 100644 ---- a/tests/data/SPECS/replacetest.spec -+++ b/tests/data/SPECS/replacetest.spec -@@ -1,6 +1,7 @@ - %{!?filetype: %global filetype file} - %{?fixit: %global havepretrans 1} - %{!?user: %global user root} -+%{!?grp: %global grp root} - - Name: replacetest%{?sub:-%{sub}} - Version: %{ver} -@@ -44,5 +45,5 @@ rm -rf $RPM_BUILD_ROOT - %endif - - %files --%defattr(-,%{user},%{user},-) -+%defattr(-,%{user},%{grp},-) - /opt/* -diff --git a/tests/rpmreplace.at b/tests/rpmreplace.at -index 11e6221d7..6f0444bb7 100644 ---- a/tests/rpmreplace.at -+++ b/tests/rpmreplace.at -@@ -403,6 +403,7 @@ runroot rpmbuild --quiet -bb \ - --define "filetype datadir" \ - --define "filedata README1" \ - --define "user $(id -u -n)" \ -+ --define "grp $(id -g -n)" \ - /data/SPECS/replacetest.spec - - runroot rpmbuild --quiet -bb \ -@@ -410,6 +411,7 @@ runroot rpmbuild --quiet -bb \ - --define "filetype datadir" \ - --define "filedata README2" \ - --define "user $(id -u -n)" \ -+ --define "grp $(id -g -n)" \ - /data/SPECS/replacetest.spec - - mkdir "${RPMTEST}"/opt/f00f -diff --git a/tests/rpmverify.at b/tests/rpmverify.at -index c5530de69..78f50fd33 100644 ---- a/tests/rpmverify.at -+++ b/tests/rpmverify.at -@@ -78,6 +78,7 @@ runroot rpmbuild --quiet -bb \ - --define "filetype datadir" \ - --define "filedata README1" \ - --define "user $(id -u -n)" \ -+ --define "grp $(id -g -n)" \ - /data/SPECS/replacetest.spec - - runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm --- -2.13.6 - diff --git a/rpm.spec b/rpm.spec index c5bd3b6..02b6481 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,9 +29,9 @@ %define rpmhome /usr/lib/rpm -%global rpmver 4.14.0 +%global rpmver 4.14.1 #global snapver rc2 -%global rel 2 +%global rel 1 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -66,7 +66,6 @@ Patch4: rpm-4.8.1-use-gpg2.patch Patch5: rpm-4.12.0-rpm2cpio-hack.patch # Patches already upstream: -Patch100: 0001-Don-t-assume-per-user-groups-in-test-suite.patch # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch @@ -489,11 +488,14 @@ done find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f # These live in perl-generators and python-rpm-generators now -rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,python*} +rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*} rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*} # Axe unused cruft rm -f $RPM_BUILD_ROOT/%{rpmhome}/{tcl.req,osgideps.pl} +# Avoid unnecessary dependency on /usr/bin/python +chmod a-x $RPM_BUILD_ROOT/%{rpmhome}/python-macro-helper + %if %{with check} %check make check || cat tests/rpmtests.log @@ -597,6 +599,7 @@ make check || cat tests/rpmtests.log %{rpmhome}/sepdebugcrcfix %{rpmhome}/find-debuginfo.sh %{rpmhome}/find-lang.sh +%{rpmhome}/python-macro-helper %{rpmhome}/*provides* %{rpmhome}/*requires* %{rpmhome}/*deps* @@ -646,6 +649,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Thu Feb 1 2018 Panu Matilainen - 4.14.1-1 +- Rebase to 4.14.1 (http://rpm.org/wiki/Releases/4.14.1) + * Thu Oct 12 2017 Panu Matilainen - 4.14.0-2 - Dump out test-suite log in case of failures again - Don't assume per-user groups in test-suite diff --git a/sources b/sources index 6cb4316..9bdf10c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.14.0.tar.bz2) = df6c063b4c30c3652cdf09e709b96f89b61c89aa4726b25f1132a51da3da67e33598d8acaf0134fad27ad4b38c619b9e1d77571697f2efa227fcfcac56651c82 +SHA512 (rpm-4.14.1.tar.bz2) = 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218