Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2015-04-02 16:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom" Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2012-06-16 07:23:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jdom.new/jdom.changes 2015-04-02 16:00:48.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Mar 31 10:15:26 UTC 2015 - [email protected] + +- Provide and obsolete jaxen-bootstrap to avoid file conflict + +------------------------------------------------------------------- +Tue Mar 24 12:34:14 UTC 2015 - [email protected] + +- Fix namespace clash with javapackages-tools on variables + +------------------------------------------------------------------- +Tue Mar 24 11:17:50 UTC 2015 - [email protected] + +- Cleanup with spec-cleaner and add debug output + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.lle0f8/_old 2015-04-02 16:00:49.000000000 +0200 +++ /var/tmp/diff_new_pack.lle0f8/_new 2015-04-02 16:00:49.000000000 +0200 @@ -1,8 +1,7 @@ -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: # # spec file for package jdom # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,7 +33,6 @@ %define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version} %define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}-%{jdom_version} %define stage1_build_dir %{_builddir}/build - Name: jdom Version: 1.1 Release: 0 @@ -56,18 +54,18 @@ Patch0: jdom-1.1-build.xml.patch Patch1: include-glibj.jar.patch Patch2: jdom-1.1-xom-get-jaxen.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: ant BuildRequires: ant-junit BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: junit BuildRequires: servletapi5 -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel BuildRequires: unzip +BuildRequires: xalan-j2 +BuildRequires: xerces-j2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description JDOM is, quite simply, a Java representation of an XML document. JDOM @@ -133,13 +131,14 @@ including Namespaces in XML, XPath, XSLT, XInclude, xml:id, and Canonical XML. XOM documents can be converted to and from SAX and DOM. - %package -n jaxen Version: 1.1.1 Release: 0 Summary: The jaxen project is a Java XPath Engine License: Apache-2.0 Group: Development/Libraries/Java +Provides: jaxen-bootstrap = %{version} +Obsoletes: jaxen-bootstrap < %{version} %description -n jaxen Jaxen is a universal object model walker, capable of evaluating XPath @@ -155,16 +154,13 @@ %patch0 %patch1 %patch2 -#%patch150 -p1 -#<<< prep -#>>> build %build -LIBGCJ=$(ls /usr/share/java/libgcj* | tail -n1 ) +LIBGCJ=$(ls %{_datadir}/java/libgcj* | tail -n1 ) LIBGCJ=$(basename $LIBGCJ) export GC_MAXIMUM_HEAP_SIZE="134217728" #128M -export JAVACMD_OPTS="-C -ftarget=1.5" -export JAVACMD="javac ${JAVACMD_OPTS} " +export JAVA_OPTS="-C -ftarget=1.5" +export JAVAC="javac ${JAVA_OPTS} " i=0 export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit servletapi5):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java" SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java" @@ -173,7 +169,7 @@ do i=$((i+1)) echo compiling class \# $i of ${MAX} - ${JAVACMD} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file" + ${JAVAC} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file" done unset CLASSPATH SOURCE_DIRS MAX @@ -190,7 +186,7 @@ mkdir build #mkdir %{_builddir}/jaxen-excluded #mv org/jaxen/dom4j %{_builddir}/jaxen-excluded -${JAVACMD} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java") +${JAVAC} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java") cd build jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar * popd @@ -218,15 +214,12 @@ #<<< build %install -mkdir -p $RPM_BUILD_ROOT/%{_javadir} -mv %{_builddir}/*.jar $RPM_BUILD_ROOT/%{_javadir} -ln -sf %{_javadir}/jdom-%{jdom_version}.jar $RPM_BUILD_ROOT/%{_javadir}/jdom.jar -ln -sf %{_javadir}/jaxen-%{jaxen_version}.jar $RPM_BUILD_ROOT/%{_javadir}/jaxen.jar -ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar $RPM_BUILD_ROOT/%{_javadir}/saxpath.jar -ln -sf %{_javadir}/xom-%{xom_version}.jar $RPM_BUILD_ROOT/%{_javadir}/xom.jar - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}/%{_javadir} +mv %{_builddir}/*.jar %{buildroot}/%{_javadir} +ln -sf %{_javadir}/jdom-%{jdom_version}.jar %{buildroot}/%{_javadir}/jdom.jar +ln -sf %{_javadir}/jaxen-%{jaxen_version}.jar %{buildroot}/%{_javadir}/jaxen.jar +ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar %{buildroot}/%{_javadir}/saxpath.jar +ln -sf %{_javadir}/xom-%{xom_version}.jar %{buildroot}/%{_javadir}/xom.jar %files %defattr(-,root,root)
