!113 Disable three new plugins in 4.17.0

Merge pull request !113 from renxichen/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-06 08:57:01 +00:00 committed by Gitee
commit 52b95d2d1f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,6 +1,6 @@
Name: rpm
Version: 4.17.0
Release: 2
Release: 3
Summary: RPM Package Manager
License: GPLv2+
URL: http://www.rpm.org/
@ -27,10 +27,8 @@ 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 dwz gnupg2
BuildRequires: debugedit
BuildRequires: system-rpm-config dwz gnupg2 debugedit
Requires: coreutils popt curl zstd libcap crontabs logrotate
Requires: debugedit
Obsoletes: %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron
Provides: %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron
Obsoletes: %{name}-plugin-selinux %{name}-plugin-syslog %{name}-plugin-systemd-inhibit < 4.15.1-28 %{name}-plugin-ima %{name}-plugin-prioreset
@ -56,7 +54,7 @@ Summary: Scripts and executable programs used to build packages
Requires: %{name} = %{version}-%{release}
Requires: elfutils binutils findutils sed grep gawk diffutils file patch
Requires: tar unzip gzip bzip2 cpio xz zstd pkgconfig system-rpm-config
Requires: gdb-headless
Requires: gdb-headless debugedit
%description build
This package provides scripts and executable programs that used to
@ -135,7 +133,9 @@ done;
--enable-ndb \
--enable-bdb=no \
--enable-sqlite=no \
--with-crypto=openssl
--with-crypto=openssl \
--with-fapolicyd=no \
--with-fsverity=no
%make_build
@ -178,6 +178,7 @@ find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
rm -f $RPM_BUILD_ROOT/%{_rpmconfigdir}/{perldeps.pl,perl.*,pythond*}
rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
rm -f $RPM_BUILD_ROOT/%{_rpmconfigdir}/{tcl.req,osgideps.pl}
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/org.rpm.conf
%check
make check || (cat tests/rpmtests.log; exit 0)
@ -231,7 +232,6 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_rpmconfigdir}/rpm2cpio.sh
%{_rpmconfigdir}/tgpg
%{_rpmconfigdir}/platform
%{_sysconfdir}/dbus-1/system.d/org.rpm.conf
%{_libdir}/rpm-plugins/
%exclude %{_libdir}/rpm-plugins/systemd_inhibit.so
%dir %{_rpmconfigdir}/fileattrs
@ -289,6 +289,12 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_mandir}/man1/gendiff.1*
%changelog
* Tue Jan 04 2022 renhongxun<renhongxun@huawei.com> - 4.17.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:disable three new plugins
* Wed Dec 29 2021 renhongxun<renhongxun@huawei.com> - 4.17.0-2
- Type:bugfix
- ID:NA