Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jdom2 for openSUSE:Factory checked in at 2023-08-31 13:42:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom2 (Old) and /work/SRC/openSUSE:Factory/.jdom2.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom2" Thu Aug 31 13:42:30 2023 rev:5 rq:1108066 version:2.0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/jdom2/jdom2.changes 2022-01-19 00:35:27.550301779 +0100 +++ /work/SRC/openSUSE:Factory/.jdom2.new.1766/jdom2.changes 2023-08-31 13:43:05.354585822 +0200 @@ -1,0 +2,9 @@ +Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Drop unused *-junit and *-contrib artifacts +- Reduce drastically dependencies +- Modified patch: + * 0001-Adapt-build.patch + + drop junit and contrib jars + +------------------------------------------------------------------- Old: ---- JDOM-2.0.6.1.tar.gz jdom-contrib-template.pom jdom-junit-template.pom New: ---- _service jdom-2.0.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom2.spec ++++++ --- /var/tmp/diff_new_pack.Zp6aod/_old 2023-08-31 13:43:06.954643012 +0200 +++ /var/tmp/diff_new_pack.Zp6aod/_new 2023-08-31 13:43:06.958643154 +0200 @@ -1,7 +1,7 @@ # # spec file for package jdom2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,24 +23,13 @@ License: Saxpath Group: Development/Libraries/Java URL: http://www.jdom.org/ -Source0: https://github.com/hunterhacker/jdom/archive/JDOM-%{version}.tar.gz -# originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom -Source1: jdom-contrib-template.pom -Source2: jdom-junit-template.pom -# Use system libraries -# Disable gpg signatures -# Process contrib and junit pom files +Source0: jdom-%{version}.tar.xz Patch0: 0001-Adapt-build.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes -BuildRequires: isorelax -BuildRequires: java-devel >= 1.7 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: jaxen -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-apis BuildArch: noarch %description @@ -60,40 +49,31 @@ This package contains javadoc for %{name}. %prep -%setup -q -n jdom-JDOM-%{version} -rm -r lib */lib -find -name '*.jar' -delete -find -name '*.class' -delete +%setup -q -n jdom-%{version} %patch0 -p1 -cp -p %{SOURCE1} maven/contrib.pom -cp -p %{SOURCE2} maven/junit.pom - sed -i 's/\r//' LICENSE.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml +# XPath functionality is not needed +rm -rf core/src/java/org/jdom2/xpath/ +sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMConstants.java + %build -mkdir lib -build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer -%{ant} -Dversion=%{version} -Dcompile.target=7 -Dcompile.source=7 -Dj2se.apidoc=%{_javadocdir}/java maven +mkdir -p lib +%{ant} -Dversion=%{version} -Dcompile.target=8 -Dcompile.source=8 -Dj2se.apidoc=%{_javadocdir}/java maven %install # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -install -pm 0644 build/package/jdom-%{version}-contrib.jar %{buildroot}%{_javadir}/%{name}/%{name}-contrib.jar -install -pm 0644 build/package/jdom-%{version}-junit.jar %{buildroot}%{_javadir}/%{name}/%{name}-junit.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -install -pm 0644 build/maven/core/%{name}-%{version}-contrib.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-contrib.pom -%add_maven_depmap %{name}/%{name}-contrib.pom %{name}/%{name}-contrib.jar -install -pm 0644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-junit.pom -%add_maven_depmap %{name}/%{name}-junit.pom %{name}/%{name}-junit.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ ++++++ 0001-Adapt-build.patch ++++++ --- /var/tmp/diff_new_pack.Zp6aod/_old 2023-08-31 13:43:06.982644012 +0200 +++ /var/tmp/diff_new_pack.Zp6aod/_new 2023-08-31 13:43:06.982644012 +0200 @@ -1,14 +1,14 @@ -From 40912d0cdd69b3f327402176ce622078e6d0846d Mon Sep 17 00:00:00 2001 -From: Michael Simacek <msima...@redhat.com> -Date: Mon, 23 Jul 2018 14:30:14 +0200 +From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski <mizde...@redhat.com> +Date: Mon, 20 Apr 2020 09:29:12 +0200 Subject: [PATCH] Adapt build --- - build.xml | 42 ++++++++++++++++++++++++++---------------- - 1 file changed, 26 insertions(+), 16 deletions(-) + build.xml | 61 +++---------------------------------------------------- + 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/build.xml b/build.xml -index ed632c2c..78bbe934 100644 +index ed632c2..d80abff 100644 --- a/build.xml +++ b/build.xml @@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file. @@ -26,79 +26,95 @@ - <!-- this is used for testing Java5 (the test sets stax.dir) --> - <pathelement location="${stax.dir}/jsr173_1.0_api.jar" /> - <pathelement location="${stax.dir}/sjsxp.jar" /> -+ <fileset dir="${lib.dir}" includes="*.jar" /> ++ <fileset dir="${lib.dir}" includes="*.jar" /> </path> <path id="core.class.path"> -@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file. - header="<b>${Name}<br><font size='-1'>${version}</font></b>" - bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved."> - <classpath refid="base.class.path"/> -+ <link href="${j2se.apidoc}"/> - </javadoc> +@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file. + <!-- =================================================================== --> + <!-- Creates the jars --> + <!-- =================================================================== --> +- <target name="jars" depends="compile, javadoc" ++ <target name="jars" depends="compile.core, javadoc" + description="Builds the Jars"> + <fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/> + <fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/> +@@ -316,27 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file. + <fileset dir="${core.build}" includes="**/*.class" /> + <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" /> + </jar> +- <jar jarfile="${package}/${jarbase}-contrib.jar" > +- <fileset dir="${contrib.build}" includes="**/*" /> +- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" /> +- </jar> +- <jar jarfile="${package}/${jarbase}-junit.jar" > +- <fileset dir="${junit.build}" includes="**/*" /> +- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" /> +- </jar> +- <jar destfile="${package}/${jarbase}-javadoc.jar" +- basedir="${build.javadocs}" includes="**/*" /> +- +- <jar jarfile="${package}/${jarbase}-sources.jar" > +- <fileset dir="${core.src}" includes="**/*" /> +- </jar> +- <jar jarfile="${package}/${jarbase}-junit-sources.jar" > +- <fileset dir="${junit.src}" includes="**/*" /> +- </jar> +- <jar jarfile="${package}/${jarbase}-contrib-sources.jar" > +- <fileset dir="${contrib.src}" includes="**/*" /> +- </jar> +- </target> -@@ -378,11 +369,11 @@ For instructions on how to build JDOM, please view the README.txt file. - <!-- =================================================================== --> - <target name="package" depends="coverage, jars" - description="Creates the class package"> -- <zip destfile="${package}/${jarbase}.zip"> -+ <!--<zip destfile="${package}/${jarbase}.zip"> - <fileset dir="${package}" includes="${jarbase}*.jar" /> - <fileset dir="${basedir}" includes="lib/xerces* lib/jaxen* lib/xml* lib/xalan/**" /> - <fileset dir="${basedir}" includes="LICENSE.txt README.txt" /> -- </zip> -+ </zip>--> + <target name="androidtests" depends="jars"> +@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file. + <delete dir="${mavendir}" includes="**/*" failonerror="false"/> </target> - - <!-- =================================================================== --> -@@ -406,6 +397,7 @@ For instructions on how to build JDOM, please view the README.txt file. - <include name="**/*.class"/> - <!-- exclude name="**/**/jaxen/**/*.class"/ --> - </fileset> -+ <classpath refid="junit.class.path" /> - </cobertura-instrument> + +- <target name="maven" depends="maven.clean, package" ++ <target name="maven" depends="maven.clean, jars" + description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central"> + <mkdir dir="${mavendir}" /> + <mkdir dir="${mavendir}/core" /> +@@ -517,8 +486,6 @@ For instructions on how to build JDOM, please view the README.txt file. + + <!-- copy the build jar --> + <copy tofile="${mavendir}/core/${mavenbase}.jar" file="${package}/${jarbase}.jar"/> +- <copy tofile="${mavendir}/core/${mavenbase}-javadoc.jar" file="${package}/${jarbase}-javadoc.jar"/> +- <copy tofile="${mavendir}/core/${mavenbase}-sources.jar" file="${package}/${jarbase}-sources.jar"/> - <property name="forkjunit" value="true" /> -@@ -533,7 +525,25 @@ For instructions on how to build JDOM, please view the README.txt file. + <!-- load the license in to the ${license} property --> + <loadfile property="license" srcfile="LICENSE.txt" /> +@@ -532,28 +499,6 @@ For instructions on how to build JDOM, please view the README.txt file. + <filter token="license" value="${license}" /> </filterset> </copy> - +- - <exec dir="${mavendir}/core" executable="${gpg}"> -+ <copy filtering="true" file="maven/contrib.pom" tofile="${mavendir}/core/${mavenbase}-contrib.pom"> -+ <filterset> -+ <filter token="artifactID" value="${mavenartifact}"/> -+ <filter token="version" value="${version}" /> -+ <filter token="jdk" value="${compile.target}" /> -+ <filter token="license" value="${license}" /> -+ </filterset> -+ </copy> -+ -+ <copy filtering="true" file="maven/junit.pom" tofile="${mavendir}/core/${mavenbase}-junit.pom"> -+ <filterset> -+ <filter token="artifactID" value="${mavenartifact}"/> -+ <filter token="version" value="${version}" /> -+ <filter token="jdk" value="${compile.target}" /> -+ <filter token="license" value="${license}" /> -+ </filterset> -+ </copy> -+ -+ <!--exec dir="${mavendir}/core" executable="${gpg}"> - <arg value="-abv"/> - <arg value="${mavenbase}.pom"/> - </exec> -@@ -548,8 +558,8 @@ For instructions on how to build JDOM, please view the README.txt file. - <exec dir="${mavendir}/core" executable="${gpg}"> - <arg value="-abv"/> - <arg value="${mavenbase}-javadoc.jar"/> +- <arg value="-abv"/> +- <arg value="${mavenbase}.pom"/> - </exec> +- <exec dir="${mavendir}/core" executable="${gpg}"> +- <arg value="-abv"/> +- <arg value="${mavenbase}.jar"/> +- </exec> +- <exec dir="${mavendir}/core" executable="${gpg}"> +- <arg value="-abv"/> +- <arg value="${mavenbase}-sources.jar"/> +- </exec> +- <exec dir="${mavendir}/core" executable="${gpg}"> +- <arg value="-abv"/> +- <arg value="${mavenbase}-javadoc.jar"/> +- </exec> +- +- <jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar" +- basedir="${mavendir}/core" +- includes="${mavenbase}*" excludes="*maven-bundle*" /> - -+ </exec--> -+ - <jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar" - basedir="${mavendir}/core" - includes="${mavenbase}*" excludes="*maven-bundle*" /> + </target> + + </project> -- -2.34.1 +2.37.2 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/hunterhacker/jdom.git</param> <param name="revision">JDOM-2.0.6.1</param> <param name="match-tag">JDOM-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">JDOM-(.*)</param> <param name="exclude">lib/*</param> <param name="exclude">*/lib</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
