From c57ccc26d71c651543a48e07612fbecb54d5a7c5dd320554bc48800adf3a5360 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 14 Mar 2020 08:07:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=12

---
 maven-doxia.changes |  5 +++++
 maven-doxia.spec    | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/maven-doxia.changes b/maven-doxia.changes
index 1cc8b81..5417607 100644
--- a/maven-doxia.changes
+++ b/maven-doxia.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Mar 14 08:07:06 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Set obsoletes to make upgrades easier
+
 -------------------------------------------------------------------
 Wed Mar 11 11:37:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-doxia.spec b/maven-doxia.spec
index f4283e4..b1f3e7f 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -70,6 +70,8 @@ generation systems like blogs, wikis and content management systems.
 %package core
 Summary:        Core module for %{name}
 Group:          Development/Libraries/Java
+Obsoletes:      %{name}-module-itext
+Obsoletes:      %{name}-module-markdown
 
 %description core
 This package provides %{summary}.
@@ -116,13 +118,6 @@ Group:          Development/Libraries/Java
 %description module-fo
 This package provides %{summary}.
 
-%package module-xhtml5
-Summary:        XHTML5 module for %{name}
-Group:          Development/Libraries/Java
-
-%description module-xhtml5
-This package provides %{summary}.
-
 %package module-latex
 Summary:        Latex module for %{name}
 Group:          Development/Libraries/Java
@@ -158,6 +153,13 @@ Group:          Development/Libraries/Java
 %description module-xhtml
 This package provides %{summary}.
 
+%package module-xhtml5
+Summary:        XHTML5 module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-xhtml5
+This package provides %{summary}.
+
 %package sink-api
 Summary:        Sink-api module for %{name}
 Group:          Development/Libraries/Java
@@ -198,6 +200,7 @@ API documentation for %{name}.
 rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
 
 %pom_disable_module doxia-module-itext doxia-modules
+%pom_disable_module doxia-module-markdown doxia-modules
 
 %{mvn_package} :doxia __noinstall
 %{mvn_package} :doxia-modules __noinstall
@@ -284,8 +287,6 @@ done
 
 %files module-fo -f .mfiles-doxia-module-fo
 
-%files module-xhtml5 -f .mfiles-doxia-module-xhtml5
-
 %files module-latex -f .mfiles-doxia-module-latex
 
 %files module-rtf -f .mfiles-doxia-module-rtf
@@ -296,6 +297,8 @@ done
 
 %files module-xhtml -f .mfiles-doxia-module-xhtml
 
+%files module-xhtml5 -f .mfiles-doxia-module-xhtml5
+
 %files sink-api -f .mfiles-doxia-sink-api
 
 %files test-docs -f .mfiles-doxia-test-docs