From 150dc8fb5e74e9b96f46967e46711c540072b493 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Fri, 14 Feb 2020 14:07:51 +0800 Subject: [PATCH] skip updating the preference of gpg --- 0001-skip-updating-the-preferences.patch | 39 ++++++++++++++++++++++++ rpm.spec | 15 +++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 0001-skip-updating-the-preferences.patch diff --git a/0001-skip-updating-the-preferences.patch b/0001-skip-updating-the-preferences.patch new file mode 100644 index 0000000..765d425 --- /dev/null +++ b/0001-skip-updating-the-preferences.patch @@ -0,0 +1,39 @@ +From 90e2b3a3b1a6d2b18c4421ed17a94aa5c56108a8 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Thu, 13 Feb 2020 21:32:33 +0800 +Subject: [PATCH] skip updating the preferences + +--- + tests/Makefile.am | 2 +- + tests/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 10f095b..ab92353 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -167,7 +167,7 @@ populate_testing: + for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils xargs; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done + for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done + (cd testing/magic && file -C) +- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret ++ HOME=$(abs_builddir)/testing gpg2 --import --batch ${abs_srcdir}/data/keys/*.secret + + check_DATA = atconfig atlocal $(TESTSUITE) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 16bcdd5..5603c54 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -695,7 +695,7 @@ populate_testing: + for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils xargs; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done + for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done + (cd testing/magic && file -C) +- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret ++ HOME=$(abs_builddir)/testing gpg2 --import --batch ${abs_srcdir}/data/keys/*.secret + + @HAVE_FAKECHROOT_TRUE@check-local: $(check_DATA) populate_testing + @HAVE_FAKECHROOT_TRUE@ $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) +-- +1.8.3.1 + diff --git a/rpm.spec b/rpm.spec index 2ebfae1..a7f8870 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.15.1 -Release: 7 +Release: 8 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -9,6 +9,7 @@ Source0: http://ftp.rpm.org/releases/rpm-4.15.x/%{name}-%{version}.tar.bz2 Patch1: 0001-Unbundle-config-site-and-add-RPM-LD-FLAGS-macro.patch Patch2: rpm-4.12.0-rpm2cpio-hack.patch Patch3: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch +Patch4: 0001-skip-updating-the-preferences.patch Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch Patch9001: 0001-bugfix-rpm-4.14.2-fix-tty-failed.patch @@ -18,7 +19,7 @@ BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel BuildRequires: dbus-devel fakechroot elfutils-devel elfutils-libelf-devel ima-evm-utils BuildRequires: lua-devel libcap-devel libacl-devel libselinux-devel file-devel gettext-devel ncurses-devel -BuildRequires: system-rpm-config +BuildRequires: system-rpm-config gdb dwz Requires: coreutils popt curl zstd libcap gnupg2 crontabs logrotate libdb-utils %{name}-libs Obsoletes: %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron Provides: %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron @@ -186,6 +187,10 @@ make check || (cat tests/rpmtests.log; exit 0) %postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files -f %{name}.lang %defattr(-,root,root) %license COPYING @@ -275,6 +280,12 @@ make check || (cat tests/rpmtests.log; exit 0) %{_mandir}/man1/gendiff.1* %changelog +* Fri Feb 14 2020 openEuler Buildteam - 4.15.1-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:skip update the preference of gpg during make check + * Mon Jan 20 2020 openEuler Buildteam - 4.15.1-7 - Type:bugfix - ID:NA