From 0276b63e45022c64bfd02496790ea9cf7dee6ecf Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: May 07 2020 12:40:06 +0000
Subject: update to version 1.9.1


---

diff --git a/.gitignore b/.gitignore
index 808173e..1a5342a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ maven-doxia-1.1.2.tar.gz
 /doxia-1.7-source-release.zip
 /doxia-1.8-source-release.zip
 /doxia-1.9-source-release.zip
+/doxia-1.9.1-source-release.zip
diff --git a/0002-Disable-tests-which-rely-on-ordering-in-set.patch b/0002-Disable-tests-which-rely-on-ordering-in-set.patch
deleted file mode 100644
index bc57e86..0000000
--- a/0002-Disable-tests-which-rely-on-ordering-in-set.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6e1707a4bdea698f62fac215b6bca646bf14e4b4 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-Date: Wed, 26 Mar 2014 09:58:20 +0100
-Subject: [PATCH 3/4] Disable tests which rely on ordering in set
-
----
- .../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java   | 3 +++
- .../java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java     | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
-index 3ac8734..707cdf1 100644
---- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
-+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
-@@ -452,6 +452,7 @@ public abstract class AbstractSinkTest
-      * invoked on the current sink, produces the same result as
-      * {@link #getFigureBlock getFigureBlock}( source, caption ).
-      */
-+    /*
-     public void testFigure() throws Exception
-     {
-         String source = "figure.jpg";
-@@ -511,6 +512,7 @@ public abstract class AbstractSinkTest
-      * invoked on the current sink, produces the same result as
-      * {@link #getTableBlock getTableBlock}( cell, caption ).
-      */
-+    /*
-     public void testTable() throws Exception
-     {
-         String cell = "cell";
-@@ -544,6 +543,7 @@ public abstract class AbstractSinkTest
-             assertEquals( actual, expected );
-         }
-     }
-+    */
- 
-     /**
-      * Checks that the sequence <code>[paragraph(), text( text ),
-diff --git a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
-index 847c341..729357b 100644
---- a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
-+++ b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
-@@ -164,6 +164,7 @@ public class FoAggregateSinkTest
-     /**
-      * Test of figureGraphics method, of class FoAggregateSink.
-      */
-+    /*
-     public void testFigureGraphics() throws Exception
-     {
-         try
-@@ -188,6 +188,7 @@ public class FoAggregateSinkTest
-
-         assertThat ( wrapXml( actual ), CompareMatcher.isIdenticalTo( wrapXml( expected ) ));
-     }
-+    */
- 
-     /**
-      * Test of anchor method, of class FoAggregateSink.
--- 
-2.5.5
-
diff --git a/maven-doxia.spec b/maven-doxia.spec
index a3f8908..692bac2 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -2,22 +2,19 @@
 %bcond_with    fop
 
 Name:           maven-doxia
-Version:        1.9
-Release:        4%{?dist}
 Epoch:          0
+Version:        1.9.1
+Release:        1%{?dist}
 Summary:        Content generation framework
 License:        ASL 2.0
-URL:            http://maven.apache.org/doxia/
 
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip
+URL:            https://maven.apache.org/doxia/
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip
 
 # Build against iText 2.x
 # https://issues.apache.org/jira/browse/DOXIA-53
 Patch1:         0001-Fix-itext-dependency.patch
 
-# Don't run bad tests which rely on ordering in set (they fail with Java 8)
-Patch2:         0002-Disable-tests-which-rely-on-ordering-in-set.patch
-
 BuildArch:      noarch
 
 BuildRequires:  maven-local
@@ -186,7 +183,6 @@ API documentation for %{name}.
 find -name '*.java' -exec sed -i 's/\r//' {} +
 find -name '*.xml' -exec sed -i 's/\r//' {} +
 %patch1 -p1
-%patch2 -p1
 
 # we don't have clirr-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@@ -249,6 +245,9 @@ rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
 %doc LICENSE NOTICE
 
 %changelog
+* Thu May 07 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.9.1-1
+- Update to version 1.9.1.
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index b54b1ee..501cfe8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (doxia-1.9-source-release.zip) = c9acda38da29c193a5319a925c1d12408f5167210eb72a8859d85c133c5fb45fd51774c35f2b6fe845b4051d653279e07e0c867021c407c7bf16ba57ef1a3565
+SHA512 (doxia-1.9.1-source-release.zip) = a2087b438215b586d67a277b082d070ad3f866ca9d97c69c11312e34a846920a0af342d2e1d77edf841e9ee21c08fc5480a30f073267771b203f94297cfa943f