Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jaxen-bootstrap for openSUSE:Factory
checked in at 2022-03-28 16:59:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jaxen-bootstrap (Old)
and /work/SRC/openSUSE:Factory/.jaxen-bootstrap.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jaxen-bootstrap"
Mon Mar 28 16:59:18 2022 rev:15 rq:963092 version:1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jaxen-bootstrap/jaxen-bootstrap.changes
2017-09-13 22:20:36.389784554 +0200
+++
/work/SRC/openSUSE:Factory/.jaxen-bootstrap.new.1900/jaxen-bootstrap.changes
2022-03-28 16:59:54.376915994 +0200
@@ -1,0 +2,9 @@
+Sat Mar 19 21:42:10 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Build with source/target levels 8
+- Clean-up the build system
+- Removed patch:
+ * jaxen-bootstrap-project_xml.patch
+ + not needed in the rewamped build system
+
+-------------------------------------------------------------------
Old:
----
jaxen-1.1-b7-jpp-depmap.xml
jaxen-bootstrap-project_xml.patch
pom-maven2jpp-depcat.xsl
pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jaxen-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.yFPfr7/_old 2022-03-28 16:59:54.844916629 +0200
+++ /var/tmp/diff_new_pack.yFPfr7/_new 2022-03-28 16:59:54.852916640 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jaxen-bootstrap
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,85 +12,49 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define with_maven 0
%define real jaxen
%define dom4jver 1.6.1
-%define section free
-
Name: jaxen-bootstrap
Version: 1.1
Release: 0
Summary: A convenience package for build of dom4j
License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://jaxen.codehaus.org/
+URL: http://jaxen.codehaus.org/
Source0:
http://dist.codehaus.org/jaxen/distributions/jaxen-1.1-src.tar.bz2
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: jaxen-1.1-b7-jpp-depmap.xml
# Debian sources don't need a proprietary msv for build, so that's why I used
them
# svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j
# rm dom4j/docs/xref/org/dom4j/tree/ConcurrentReaderHashMap.html
# rm dom4j/docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html
-# #bnc501764
+# bnc#501764
# rm dom4j/lib/tools/clover.license
# tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/
-Source5:
http://prdownloads.sourceforge.net/dom4j/dom4j-%{dom4jver}-debian.tar.bz2
-Source6: jaxen-1.1-b7-build.xml
-Patch0: jaxen-bootstrap-project_xml.patch
-Requires: xalan-j2
-Requires: xerces-j2
-Requires: xom
+Source1:
http://prdownloads.sourceforge.net/dom4j/dom4j-%{dom4jver}-debian.tar.bz2
+Source2: jaxen-1.1-b7-build.xml
BuildRequires: ant >= 1.6
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
-BuildRequires: junit
-%if %{with_maven}
-BuildRequires: maven >= 1.1
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-test
-BuildRequires: maven-plugins-base
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%endif
-BuildRequires: java-devel
BuildRequires: unzip
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xom
+Requires: xalan-j2
+Requires: xerces-j2
+Requires: xom
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Dom4j depends on a jaxen build with dom4j support. This package must
only be installed in the rare event of having to rebuild dom4j.
-
-
%prep
-%setup -q -n %{real}-%{version}
-tar -xf %{SOURCE5}
-#/bin/gzip -dc %{SOURCE5} | tar -xf -
-cp %{SOURCE6} build.xml
+%setup -q -n %{real}-%{version} -a1
+cp %{SOURCE2} build.xml
find . -name "*.jar" -exec rm -f {} \;
-%patch0 -b .sav
-%if %{with_maven}
-export DEPCAT=$(pwd)/jaxen-1.1-b7-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > jaxen-1.1-b7-depmap.new.xml
-%endif
rm -rf src/java/main/org/jaxen/jdom
rm -rf src/java/test/org/jaxen/jdom
rm -f src/java/test/org/jaxen/test/JaxenTests.java
@@ -100,58 +64,37 @@
rm -f src/java/test/org/jaxen/test/JDOMXPathTest.java
%build
-export CLASSPATH=$(build-classpath \
-xom \
-jdom \
-xalan-j2 \
-xerces-j2 \
-)
-pushd dom4j/src/java
-javac -sourcepath ../../../src/java/main:. \
- org/dom4j/Attribute.java \
- org/dom4j/Branch.java \
- org/dom4j/CDATA.java \
- org/dom4j/Comment.java \
- org/dom4j/Document.java \
- org/dom4j/DocumentException.java \
- org/dom4j/Element.java \
- org/dom4j/Namespace.java \
- org/dom4j/Node.java \
- org/dom4j/ProcessingInstruction.java \
- org/dom4j/Text.java \
- org/dom4j/io/SAXReader.java
-jar cf ../../dom4j.jar $(find . -name "*.class")
-popd
-mkdir -p .maven/repository/JPP/jars
-cp dom4j/dom4j.jar .maven/repository/JPP/jars/dom4j.jar
-%if %{with_maven}
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-maven \
- -Dmaven.test.skip=true \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$(pwd)/.maven \
- jar
-%else
-export CLASSPATH=$CLASSPATH:dom4j/dom4j.jar
-ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
- -Dbuild.sysclasspath=first
-%endif
+mkdir -p lib
+build-jar-repository -s lib \
+ xom \
+ xalan-j2 \
+ xerces-j2
+
+mkdir -p dom4j/classes
+javac \
+ -source 8 -target 8 -d dom4j/classes \
+ -sourcepath src/java/main:dom4j/src/java \
+ dom4j/src/java/org/dom4j/Attribute.java \
+ dom4j/src/java/org/dom4j/Branch.java \
+ dom4j/src/java/org/dom4j/CDATA.java \
+ dom4j/src/java/org/dom4j/Comment.java \
+ dom4j/src/java/org/dom4j/Document.java \
+ dom4j/src/java/org/dom4j/DocumentException.java \
+ dom4j/src/java/org/dom4j/Element.java \
+ dom4j/src/java/org/dom4j/Namespace.java \
+ dom4j/src/java/org/dom4j/Node.java \
+ dom4j/src/java/org/dom4j/ProcessingInstruction.java \
+ dom4j/src/java/org/dom4j/Text.java \
+ dom4j/src/java/org/dom4j/io/SAXReader.java
+
+jar cf lib/dom4j.jar -C dom4j/classes .
+
+%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{real}-%{version}-beta-7.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{real}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 target/%{real}-%{version}-beta-7.jar
%{buildroot}%{_javadir}/%{real}.jar
%files
%defattr(0644,root,root,0755)
++++++ jaxen-1.1-b7-build.xml ++++++
--- /var/tmp/diff_new_pack.yFPfr7/_old 2022-03-28 16:59:54.884916683 +0200
+++ /var/tmp/diff_new_pack.yFPfr7/_new 2022-03-28 16:59:54.888916689 +0200
@@ -8,43 +8,25 @@
<property file="${user.home}/build.properties"></property>
<!--Build properties-->
<property name="defaulttargetdir" value="${basedir}/target"></property>
- <property name="libdir" value="${user.home}/.maven/repository"></property>
+ <property name="libdir" value="lib"></property>
<property name="classesdir" value="${basedir}/target/classes"></property>
<property name="testclassesdir"
value="${basedir}/target/test-classes"></property>
<property name="testreportdir"
value="${basedir}/target/test-reports"></property>
<property name="distdir" value="${basedir}/dist"></property>
<property name="javadocdir" value="${basedir}/dist/docs/api"></property>
<property name="final.name" value="jaxen-1.1-beta-7"></property>
- <property name="proxy.host" value=""></property>
- <property name="proxy.port" value=""></property>
- <property name="proxy.username" value=""></property>
- <property name="proxy.password" value=""></property>
<path id="build.classpath">
- <pathelement location="${libdir}/JPP/jars/dom4j.jar"></pathelement>
- <pathelement location="${libdir}/JPP/jars/jdom.jar"></pathelement>
- <pathelement
location="${libdir}/JPP/jars/xml-commons-apis.jar"></pathelement>
- <pathelement location="${libdir}/JPP/jars/xerces-j2.jar"></pathelement>
- <pathelement location="${libdir}/JPP/jars/xom.jar"></pathelement>
- <pathelement location="${libdir}/JPP/jars/junit.jar"></pathelement>
+ <fileset dir="${libdir}">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}"></mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}"></equals>
- </condition>
<!--Test if JUNIT is present in ANT classpath-->
<available property="Junit.present"
classname="junit.framework.Test"></available>
<!--Test if user defined a proxy-->
- <condition property="useProxy">
- <and>
- <isset property="proxy.host"></isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
- </not>
- </and>
- </condition>
</target>
- <target name="compile" description="o Compile the code" depends="get-deps">
+ <target name="compile" description="o Compile the code">
<mkdir dir="${classesdir}"></mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
@@ -113,7 +95,7 @@
</fileset>
</copy>
</target>
- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <target name="javadoc" description="o Generate javadoc">
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="2001-yyyy" property="year"></format>
@@ -126,70 +108,5 @@
</classpath>
</javadoc>
</target>
- <target name="get-dep-dom4j.jar" description="o Download the dependency :
dom4j.jar" unless="dom4j.jar"
depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/dom4j.jar"></get>
- </target>
- <target name="get-custom-dep-dom4j.jar" if="dom4j.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true"
ignoreerrors="true" src="${dom4j.jar}"></get>
- </target>
- <target name="get-dep-jdom.jar" description="o Download the dependency :
jdom.jar" unless="jdom.jar"
depends="init,setProxy,noProxy,get-custom-dep-jdom.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/jdom.jar"></get>
- </target>
- <target name="get-custom-dep-jdom.jar" if="jdom.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true"
ignoreerrors="true" src="${jdom.jar}"></get>
- </target>
- <target name="get-dep-xmlParserAPIs.jar" description="o Download the
dependency : xmlParserAPIs.jar" unless="xmlParserAPIs.jar"
depends="init,setProxy,noProxy,get-custom-dep-xmlParserAPIs.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/xml-commons-apis.jar"></get>
- </target>
- <target name="get-custom-dep-xmlParserAPIs.jar" if="xmlParserAPIs.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true"
ignoreerrors="true" src="${xmlParserAPIs.jar}"></get>
- </target>
- <target name="get-dep-xercesImpl.jar" description="o Download the dependency
: xercesImpl.jar" unless="xercesImpl.jar"
depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/xerces-j2.jar"></get>
- </target>
- <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true"
ignoreerrors="true" src="${xercesImpl.jar}"></get>
- </target>
- <target name="get-dep-xom.jar" description="o Download the dependency :
xom.jar" unless="xom.jar"
depends="init,setProxy,noProxy,get-custom-dep-xom.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/xom.jar"></get>
- </target>
- <target name="get-custom-dep-xom.jar" if="xom.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true"
ignoreerrors="true" src="${xom.jar}"></get>
- </target>
- <target name="get-dep-junit.jar" description="o Download the dependency :
junit.jar" unless="junit.jar"
depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true"
ignoreerrors="true"
src="file:/usr/share/maven/repository/JPP/jars/junit.jar"></get>
- </target>
- <target name="get-custom-dep-junit.jar" if="junit.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/JPP/jars/"></mkdir>
- <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true"
ignoreerrors="true" src="${junit.jar}"></get>
- </target>
- <target name="get-deps" unless="noget"
depends="get-dep-dom4j.jar,get-dep-jdom.jar,get-dep-xmlParserAPIs.jar,get-dep-xercesImpl.jar,get-dep-xom.jar,get-dep-junit.jar"></target>
- <target name="setProxy" if="useProxy" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}"
proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
- </target>
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar"></get>
- <unjar dest="${maven.home}"
src="${user.home}/maven-install-latest.jar"></unjar>
- </target>
</project>
-(No newline at EOF)
