!8 rpm

Merge pull request !8 from syyhao/dev1

rpm.spec

@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.15.1
-Release:       5
+Release:       6
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -15,11 +15,11 @@ Patch9001: 0001-bugfix-rpm-4.14.2-fix-tty-failed.patch
 Patch9002: bugfix-rpm-4.14.2-wait-once-get-rpmlock-fail.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel libdb-devel 
-BuildRequires: system-rpm-config rpm system-rpm-config ima-evm-utils
 BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
-BuildRequires: dbus-devel fakechroot elfutils-devel elfutils-libelf-devel librpm8
+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
-Requires:      coreutils popt curl zstd libcap gnupg2 crontabs logrotate libdb-utils librpm9
+BuildRequires: system-rpm-config
+Requires:      coreutils popt curl zstd libcap gnupg2 crontabs logrotate libdb-utils %{name}-libs
 Obsoletes:     %{name}-libs %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron
 Provides:      %{name}-libs %{name}-build-libs %{name}-sign-libs %{name}-sign %{name}-cron
 Obsoletes:     %{name}-plugin-selinux %{name}-plugin-syslog %{name}-plugin-systemd-inhibit %{name}-plugin-ima %{name}-plugin-prioreset
@@ -33,16 +33,10 @@ The RPM Package Manager (RPM) is a powerful package management system capability
 -querying detailed information about the packaged software, whether installed or not
 -verifying integrity of packaged software and resulting software installation
 
-%package -n librpm8
+%package libs
-Summary:     Shared library of rpm 4.14
-
-%description -n librpm8
-Shared library of rpm 4.14 to support build.
-
-%package -n librpm9
 Summary:     Shared library of rpm 4.15
 
-%description -n librpm9
+%description libs
 Shared library of rpm 4.15.
 
 %package build
@@ -177,8 +171,6 @@ do
     ln -s ../../bin/db_${dbutil} $RPM_BUILD_ROOT/usr/lib/rpm/rpmdb_${dbutil}
 done
 
-cp -a %{_libdir}/librpm*.so.8* %{buildroot}%{_libdir}
-
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
@@ -187,8 +179,6 @@ 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}
 
-#chmod a-x $RPM_BUILD_ROOT/%{_rpmconfigdir}/python-macro-helper
-
 %check
 make check || (cat tests/rpmtests.log; exit 0)
 
@@ -236,10 +226,7 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_bindir}/rpmverify
 %{_bindir}/rpmsign
 
-%files -n librpm8
+%files libs
-%{_libdir}/librpm*.so.8*
-
-%files -n librpm9
 %{_libdir}/librpm*.so.9*
 
 %files build
@@ -288,6 +275,12 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Sat Jan 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:delete unneeded shared library
+
 * Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-5
 - Type:bugfix
 - ID:NA