From c6b587e904295416e3fc7add3a5074ddf4cf8d4c Mon Sep 17 00:00:00 2001 From: hht8 Date: Sun, 27 Sep 2020 15:55:26 +0800 Subject: [PATCH] Delete tomcat-native provides to fix confilct --- libtcnative-1-0.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libtcnative-1-0.spec b/libtcnative-1-0.spec index 7f2250c..a3100a7 100644 --- a/libtcnative-1-0.spec +++ b/libtcnative-1-0.spec @@ -1,6 +1,6 @@ Name: libtcnative-1-0 Version: 1.2.23 -Release: 1 +Release: 2 Summary: JNI wrappers for Apache Portable Runtime for Tomcat License: Apache-2.0 Url: https://tomcat.apache.org/tomcat-7.0-doc/apr.html @@ -12,7 +12,6 @@ Source2: %{name}.keyring BuildRequires: fdupes java-devel javapackages-tools apr-devel BuildRequires: openssl-devel >= 1.0.2 pkgconfig Provides: tcnative = %{version} -Provides: tomcat-native = %{version} %description Tomcat can use the Apache Portable Runtime to provide superior @@ -78,6 +77,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libtcnative-1.a %changelog +* Sun Sep 27 2020 huanghaitao - 1.2.23-2 +- Delete tomcat-native provides to fix confilct + * Fri Jul 17 2020 leiju - 1.2.23-1 - Modify BuildRequires and Requires -- Gitee