From 6d73baa4df8f7f0655a8adc6ed041025857af0ed Mon Sep 17 00:00:00 2001 From: cherry530 Date: Thu, 28 Jul 2022 19:46:57 +0800 Subject: [PATCH] Add Conflicts for javamail Signed-off-by: cherry530 (cherry picked from commit 2724a4bba8e6f6accf444311ed61151839093a4e) --- jakarta-mail.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jakarta-mail.spec b/jakarta-mail.spec index 993397f..cb5f69f 100644 --- a/jakarta-mail.spec +++ b/jakarta-mail.spec @@ -1,6 +1,6 @@ Name: jakarta-mail Version: 1.6.7 -Release: 1 +Release: 2 Summary: Jakarta Mail API License: EPL-2.0 or GPLv2 with exceptions URL: https://github.com/eclipse-ee4j/mail @@ -11,6 +11,7 @@ BuildRequires: mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +Conflicts: javamail Obsoletes: javamail-javadoc < 1.5.2-16 %description The Jakarta Mail API provides a platform-independent and @@ -56,5 +57,8 @@ export CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar %doc README.md %changelog +* Fri Jul 29 2022 xu_ping - 1.6.7-2 +- Add Conflict for javamail + * Mon Jun 6 2022 liyanan - 1.6.7-1 - package init -- Gitee