From 0d055c4037f7421a5c5bb544dcc9b116bcabe56da570799bb231f800571cb032 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 9 Nov 2019 08:35:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=151

---
 ant-antlr.changes  |  2 ++
 ant-antlr.spec     | 25 ++++++++++++++++++++-----
 ant-junit.changes  |  2 ++
 ant-junit.spec     | 25 ++++++++++++++++++++-----
 ant-junit5.changes |  2 ++
 ant-junit5.spec    | 25 ++++++++++++++++++++-----
 ant.changes        |  2 ++
 ant.spec           | 25 ++++++++++++++++++++-----
 8 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/ant-antlr.changes b/ant-antlr.changes
index efa815a..1d65d02 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -8,6 +8,8 @@ Fri Nov  8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * apache-ant-xml-apis.patch
   * reproducible-build-manifest.patch
     + rediff
+- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
+  package
 
 -------------------------------------------------------------------
 Tue Oct  1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
diff --git a/ant-antlr.spec b/ant-antlr.spec
index ede2dbe..14d3dd2 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -64,6 +64,7 @@ BuildRequires:  junit
 %endif
 %if %{with antlr}
 BuildRequires:  xerces-j2
+BuildRequires:  xz-java
 %endif
 %if %{with junit5}
 BuildRequires:  apiguardian
@@ -88,8 +89,6 @@ Provides:       ant-trax = %{version}
 %if %{with antlr}
 Requires:       antlr
 %requires_eq    ant
-Provides:       ant-antlr = %{version}-%{release}
-Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
 
 This package contains optional jsch tasks for Apache Ant.
 
+%package -n ant-xz
+Summary:        Opional xz tasks for ant
+License:        Apache-2.0
+Group:          Development/Tools/Building
+Requires:       xz-java
+%requires_eq    ant
+
+%description -n ant-xz
+Apache Ant is a Java-based build tool.
+
+This package contains optional xz tasks for Apache Ant.
+
 %package -n ant-testutil
 Summary:        Test utility classes for ant
 License:        Apache-2.0
@@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
 %endif
 %if %{with antlr}
 # we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -504,7 +515,7 @@ do
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
   elif [ "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
-  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
+  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
   else
 %if %{with junit} || %{with junit5}
@@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
 echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
 echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
 echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
+echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
 echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
 %endif
 
@@ -633,7 +645,6 @@ popd
 %if %{with antlr}
 %files -f .mfiles
 %{ant_home}/lib/ant-antlr.jar
-%{ant_home}/lib/ant-xz.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %endif
 
@@ -724,6 +735,10 @@ popd
 %{ant_home}/lib/ant-jsch.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jsch
 
+%files -n ant-xz -f .mfiles-ant-xz
+%{ant_home}/lib/ant-xz.jar
+%config(noreplace) %{_sysconfdir}/ant.d/xz
+
 %files -n ant-testutil -f .mfiles-ant-testutil
 %{ant_home}/lib/ant-testutil.jar
 %config(noreplace) %{_sysconfdir}/ant.d/testutil
diff --git a/ant-junit.changes b/ant-junit.changes
index efa815a..1d65d02 100644
--- a/ant-junit.changes
+++ b/ant-junit.changes
@@ -8,6 +8,8 @@ Fri Nov  8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * apache-ant-xml-apis.patch
   * reproducible-build-manifest.patch
     + rediff
+- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
+  package
 
 -------------------------------------------------------------------
 Tue Oct  1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
diff --git a/ant-junit.spec b/ant-junit.spec
index b6e475e..b508561 100644
--- a/ant-junit.spec
+++ b/ant-junit.spec
@@ -64,6 +64,7 @@ BuildRequires:  junit
 %endif
 %if %{with antlr}
 BuildRequires:  xerces-j2
+BuildRequires:  xz-java
 %endif
 %if %{with junit5}
 BuildRequires:  apiguardian
@@ -88,8 +89,6 @@ Provides:       ant-trax = %{version}
 %if %{with antlr}
 Requires:       antlr
 %requires_eq    ant
-Provides:       ant-antlr = %{version}-%{release}
-Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
 
 This package contains optional jsch tasks for Apache Ant.
 
+%package -n ant-xz
+Summary:        Opional xz tasks for ant
+License:        Apache-2.0
+Group:          Development/Tools/Building
+Requires:       xz-java
+%requires_eq    ant
+
+%description -n ant-xz
+Apache Ant is a Java-based build tool.
+
+This package contains optional xz tasks for Apache Ant.
+
 %package -n ant-testutil
 Summary:        Test utility classes for ant
 License:        Apache-2.0
@@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
 %endif
 %if %{with antlr}
 # we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -504,7 +515,7 @@ do
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
   elif [ "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
-  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
+  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
   else
 %if %{with junit} || %{with junit5}
@@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
 echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
 echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
 echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
+echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
 echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
 %endif
 
@@ -633,7 +645,6 @@ popd
 %if %{with antlr}
 %files -f .mfiles
 %{ant_home}/lib/ant-antlr.jar
-%{ant_home}/lib/ant-xz.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %endif
 
@@ -724,6 +735,10 @@ popd
 %{ant_home}/lib/ant-jsch.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jsch
 
+%files -n ant-xz -f .mfiles-ant-xz
+%{ant_home}/lib/ant-xz.jar
+%config(noreplace) %{_sysconfdir}/ant.d/xz
+
 %files -n ant-testutil -f .mfiles-ant-testutil
 %{ant_home}/lib/ant-testutil.jar
 %config(noreplace) %{_sysconfdir}/ant.d/testutil
diff --git a/ant-junit5.changes b/ant-junit5.changes
index efa815a..1d65d02 100644
--- a/ant-junit5.changes
+++ b/ant-junit5.changes
@@ -8,6 +8,8 @@ Fri Nov  8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * apache-ant-xml-apis.patch
   * reproducible-build-manifest.patch
     + rediff
+- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
+  package
 
 -------------------------------------------------------------------
 Tue Oct  1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
diff --git a/ant-junit5.spec b/ant-junit5.spec
index 5cf593c..6c5f6cf 100644
--- a/ant-junit5.spec
+++ b/ant-junit5.spec
@@ -64,6 +64,7 @@ BuildRequires:  junit
 %endif
 %if %{with antlr}
 BuildRequires:  xerces-j2
+BuildRequires:  xz-java
 %endif
 %if %{with junit5}
 BuildRequires:  apiguardian
@@ -88,8 +89,6 @@ Provides:       ant-trax = %{version}
 %if %{with antlr}
 Requires:       antlr
 %requires_eq    ant
-Provides:       ant-antlr = %{version}-%{release}
-Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
 
 This package contains optional jsch tasks for Apache Ant.
 
+%package -n ant-xz
+Summary:        Opional xz tasks for ant
+License:        Apache-2.0
+Group:          Development/Tools/Building
+Requires:       xz-java
+%requires_eq    ant
+
+%description -n ant-xz
+Apache Ant is a Java-based build tool.
+
+This package contains optional xz tasks for Apache Ant.
+
 %package -n ant-testutil
 Summary:        Test utility classes for ant
 License:        Apache-2.0
@@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
 %endif
 %if %{with antlr}
 # we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -504,7 +515,7 @@ do
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
   elif [ "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
-  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
+  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
   else
 %if %{with junit} || %{with junit5}
@@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
 echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
 echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
 echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
+echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
 echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
 %endif
 
@@ -633,7 +645,6 @@ popd
 %if %{with antlr}
 %files -f .mfiles
 %{ant_home}/lib/ant-antlr.jar
-%{ant_home}/lib/ant-xz.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %endif
 
@@ -724,6 +735,10 @@ popd
 %{ant_home}/lib/ant-jsch.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jsch
 
+%files -n ant-xz -f .mfiles-ant-xz
+%{ant_home}/lib/ant-xz.jar
+%config(noreplace) %{_sysconfdir}/ant.d/xz
+
 %files -n ant-testutil -f .mfiles-ant-testutil
 %{ant_home}/lib/ant-testutil.jar
 %config(noreplace) %{_sysconfdir}/ant.d/testutil
diff --git a/ant.changes b/ant.changes
index efa815a..1d65d02 100644
--- a/ant.changes
+++ b/ant.changes
@@ -8,6 +8,8 @@ Fri Nov  8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
   * apache-ant-xml-apis.patch
   * reproducible-build-manifest.patch
     + rediff
+- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
+  package
 
 -------------------------------------------------------------------
 Tue Oct  1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
diff --git a/ant.spec b/ant.spec
index 0f9d70a..7aee914 100644
--- a/ant.spec
+++ b/ant.spec
@@ -63,6 +63,7 @@ BuildRequires:  junit
 %endif
 %if %{with antlr}
 BuildRequires:  xerces-j2
+BuildRequires:  xz-java
 %endif
 %if %{with junit5}
 BuildRequires:  apiguardian
@@ -87,8 +88,6 @@ Provides:       ant-trax = %{version}
 %if %{with antlr}
 Requires:       antlr
 %requires_eq    ant
-Provides:       ant-antlr = %{version}-%{release}
-Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -329,6 +328,18 @@ Apache Ant is a Java-based build tool.
 
 This package contains optional jsch tasks for Apache Ant.
 
+%package -n ant-xz
+Summary:        Opional xz tasks for ant
+License:        Apache-2.0
+Group:          Development/Tools/Building
+Requires:       xz-java
+%requires_eq    ant
+
+%description -n ant-xz
+Apache Ant is a Java-based build tool.
+
+This package contains optional xz tasks for Apache Ant.
+
 %package -n ant-testutil
 Summary:        Test utility classes for ant
 License:        Apache-2.0
@@ -387,7 +398,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
 %endif
 %if %{with antlr}
 # we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -503,7 +514,7 @@ do
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
   elif [ "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
-  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
+  elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
   else
 %if %{with junit} || %{with junit5}
@@ -575,6 +586,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
 echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
 echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
 echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
+echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
 echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
 %endif
 
@@ -632,7 +644,6 @@ popd
 %if %{with antlr}
 %files -f .mfiles
 %{ant_home}/lib/ant-antlr.jar
-%{ant_home}/lib/ant-xz.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %endif
 
@@ -723,6 +734,10 @@ popd
 %{ant_home}/lib/ant-jsch.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jsch
 
+%files -n ant-xz -f .mfiles-ant-xz
+%{ant_home}/lib/ant-xz.jar
+%config(noreplace) %{_sysconfdir}/ant.d/xz
+
 %files -n ant-testutil -f .mfiles-ant-testutil
 %{ant_home}/lib/ant-testutil.jar
 %config(noreplace) %{_sysconfdir}/ant.d/testutil