From fab81aede4f4539a60d4307436018d354ddcf4d0 Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Thu, 16 Jan 2020 11:47:22 +0800
Subject: [PATCH 1/2] delete libimaevm0

---
 ima-evm-utils.spec | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec
index d8b0bcb..5e08d9d 100644
--- a/ima-evm-utils.spec
+++ b/ima-evm-utils.spec
@@ -1,13 +1,12 @@
 Name:         ima-evm-utils
 Version:      1.2.1
-Release:      6
+Release:      7
 Summary:      IMA/EVM control utilities
 License:      GPLv2
 URL:          http://linux-ima.sourceforge.net/
 Source0:      http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
 
-BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git ima-evm-utils libimaevm0
-Requires: libimaevm1
+BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git
 
 %description
 ima-evm-utils package provides the evmctl utility that can be used for producing
@@ -25,16 +24,6 @@ This package provides the header files for %{name}
 
 %package_help
 
-%package -n  libimaevm0
-Summary: provide libimaevm0
-%description -n  libimaevm0
-This package provides old libimaevm.so
-
-%package -n  libimaevm1
-Summary: provide libimaevm1
-%description -n  libimaevm1
-This package provides libimaevm.so
-
 %prep
 %autosetup -n %{name}-%{version} -p1 -Sgit
 
@@ -47,7 +36,6 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %make_install
-cp -a %{_libdir}/libimaevm.so.* %{buildroot}%{_libdir}
 
 %check
 make check
@@ -65,6 +53,7 @@ make check
 %doc ChangeLog README
 %license COPYING AUTHORS
 %{_bindir}/*
+%{_libdir}/*.so.*
 
 %files devel
 %{_docdir}/%{name}/*.sh
@@ -73,16 +62,13 @@ make check
 %{_libdir}/libimaevm.a
 %{_libdir}/libimaevm.la
 
-%files -n libimaevm0
-%{_libdir}/*.so.0*
-
-%files -n libimaevm1
-%{_libdir}/*.so.1*
-
 %files help
 %doc %{_mandir}/*/*
 
 %changelog
+* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.1-7
+- delete libimaevm0
+
 * Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.1-6
 - Type:enhancement
 - ID:NA

From 87cb8806e48baa92fac8ad60f9da8c5ea05ccbaf Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Mon, 20 Jan 2020 15:22:38 +0800
Subject: [PATCH 2/2] add %{name}-libs

---
 ima-evm-utils.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec
index 5e08d9d..d738621 100644
--- a/ima-evm-utils.spec
+++ b/ima-evm-utils.spec
@@ -1,20 +1,27 @@
 Name:         ima-evm-utils
 Version:      1.2.1
-Release:      7
+Release:      8
 Summary:      IMA/EVM control utilities
 License:      GPLv2
 URL:          http://linux-ima.sourceforge.net/
 Source0:      http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
 
 BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git
+Requires:     %{name}-libs = %{version}-%{release}
 
 %description
 ima-evm-utils package provides the evmctl utility that can be used for producing
 and verifying digital signatures, which are used by Linux kernel integrity subsystem.
 It can be also used to import keys into the kernel keyring.
 
+%package libs
+Summary:      shared library for IMA/EVM
+
+%description libs
+This package provides shared library for IMA/EVM.
+
 %package devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Summary: Development files for %{name}
 Provides: %{name}-static = %{version}-%{release}
 Obsoletes:%{name}-static < %{version}-%{release}
@@ -44,15 +51,18 @@ make check
 
 %preun
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc ChangeLog README
 %license COPYING AUTHORS
 %{_bindir}/*
+
+%files libs
+%defattr(-,root,root)
 %{_libdir}/*.so.*
 
 %files devel
@@ -66,6 +76,9 @@ make check
 %doc %{_mandir}/*/*
 
 %changelog
+* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.1-8
+- add %{name}-libs
+
 * Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.1-7
 - delete libimaevm0