From 2b35cbafc2f6973fd994ca217a0b53f6fab69f4aac906d25c8f41e237b4ae3c8 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 17 May 2018 20:08:11 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=37

---
 xmlgraphics-commons.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index a398b3a..db13908 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlgraphics-commons
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties

From 17d570ce5a7e5b59d81c054341d84560fd288f6e70d515d6052d9952c6bfad94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 28 Aug 2018 13:45:27 +0000
Subject: [PATCH 2/2] - Do not run target  maven_artifacts as it just copies
 file from a->b   and fails with newer ant

- Update to version 2.3:
  * no changelog available

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=38
---
 xmlgraphics-commons-2.1-src.tar.gz |  3 ---
 xmlgraphics-commons-2.3-src.tar.gz |  3 +++
 xmlgraphics-commons.changes        | 12 ++++++++++++
 xmlgraphics-commons.spec           | 10 +++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 xmlgraphics-commons-2.1-src.tar.gz
 create mode 100644 xmlgraphics-commons-2.3-src.tar.gz

diff --git a/xmlgraphics-commons-2.1-src.tar.gz b/xmlgraphics-commons-2.1-src.tar.gz
deleted file mode 100644
index 1dc14da..0000000
--- a/xmlgraphics-commons-2.1-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbf7c12647f8b39604742f13418711edfe89021c83f683e1a66e54d71c17891a
-size 2711469
diff --git a/xmlgraphics-commons-2.3-src.tar.gz b/xmlgraphics-commons-2.3-src.tar.gz
new file mode 100644
index 0000000..d286a63
--- /dev/null
+++ b/xmlgraphics-commons-2.3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43f0419ac027dcdc5d6ee684482234b87e57694d9e15d5d4b26f0fc588128328
+size 2716847
diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes
index ab884bd..f30a7ad 100644
--- a/xmlgraphics-commons.changes
+++ b/xmlgraphics-commons.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 28 13:44:48 UTC 2018 - tchvatal@suse.com
+
+- Do not run target  maven_artifacts as it just copies file from a->b
+  and fails with newer ant
+
+-------------------------------------------------------------------
+Tue Aug 28 13:12:00 UTC 2018 - tchvatal@suse.com
+
+- Update to version 2.3:
+  * no changelog available
+
 -------------------------------------------------------------------
 Fri Dec 22 13:37:24 UTC 2017 - fstrba@suse.com
 
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index db13908..485d5fe 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -18,12 +18,12 @@
 
 
 Name:           xmlgraphics-commons
-Version:        2.1
+Version:        2.3
 Release:        0
 Summary:        XML Graphics Commons
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://xmlgraphics.apache.org/
+URL:            http://xmlgraphics.apache.org/
 Source0:        http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
 Patch0:         xmlgraphics-commons-build_xml.patch
 Patch1:         xmlgraphics-commons-jdk10.patch
@@ -71,7 +71,7 @@ pushd lib
 ln -sf $(build-classpath commons-io) .
 ln -sf $(build-classpath commons-logging) .
 popd
-ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs maven-artifacts
+ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs
 
 %install
 install -Dpm 644 build/%{name}-%{version}.jar \
@@ -80,7 +80,7 @@ install -Dpm 644 build/%{name}-%{version}.jar \
 #
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap
 
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -90,7 +90,7 @@ cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 install -dm 755 %{buildroot}%{_docdir}/%{name}
 
 %files
-%doc LICENSE
+%license LICENSE
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/*
 %if %{defined _maven_repository}