Hello community, here is the log from the commit of package qdox for openSUSE:Factory checked in at 2012-11-02 07:31:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qdox (Old) and /work/SRC/openSUSE:Factory/.qdox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qdox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qdox/qdox.changes 2011-09-23 12:43:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qdox.new/qdox.changes 2012-11-02 07:31:10.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Oct 24 12:41:58 UTC 2012 - [email protected] + +- update to 1.12 + * needed for the fop 1.1 update + * mostly bugfix release, see + * http://qdox.codehaus.org/changes-report.html +- disabled tests as they tends to randomly fails + +------------------------------------------------------------------- Old: ---- qdox-1.6.1-byaccj.patch qdox-1.6.1-jflex.patch qdox-1.6.1-src.tar.bz2 qdox-1.6.1-test.patch New: ---- qdox-1.12-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qdox.spec ++++++ --- /var/tmp/diff_new_pack.K81ZaS/_old 2012-11-02 07:31:12.000000000 +0100 +++ /var/tmp/diff_new_pack.K81ZaS/_new 2012-11-02 07:31:12.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package qdox (Version 1.6.1) +# spec file for package qdox # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,15 +33,15 @@ %define section free Name: qdox -Version: 1.6.1 -Release: 2 +Version: 1.12 +Release: 0 Summary: Extract class/interface/method definitions from sources License: Apache-2.0 -Url: http://qdox.codehaus.org/ Group: Development/Libraries/Java -# svn co https://svn.codehaus.org/qdox/tags/QDOX_1_6_1/qdox -# tar czvf qdox-1.6.1-src.tar.gz qdox -Source0: qdox-%{version}-src.tar.bz2 +Url: http://qdox.codehaus.org/ +# svn checkout https://svn.codehaus.org/qdox/tags/qdox-1.12 qdox-1.12 +# tar --exclude-vcs -cJf qdox-1.12-sources.tar.xz +Source0: qdox-%{version}-src.tar.xz Source1: pom-maven2jpp-depcat.xsl Source2: pom-maven2jpp-newdepmap.xsl Source3: pom-maven2jpp-mapdeps.xsl @@ -49,28 +49,25 @@ Source5: qdox-LocatedDef.java Source6: qdox-build.xml Source7: qdox-component-info.xml -Patch0: qdox-1.6.1-byaccj.patch -Patch1: qdox-1.6.1-jflex.patch -Patch2: qdox-1.6.1-test.patch BuildRequires: jpackage-utils >= 1.6 %if %with maven +BuildRequires: jmock >= 1.0 BuildRequires: maven >= 1.1 -BuildRequires: maven-plugins-base BuildRequires: maven-plugin-license BuildRequires: maven-plugin-test BuildRequires: maven-plugin-xdoc +BuildRequires: maven-plugins-base +BuildRequires: mockobjects >= 0.09 BuildRequires: saxon BuildRequires: saxon-scripts -BuildRequires: jmock >= 1.0 -BuildRequires: mockobjects >= 0.09 %endif BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 -BuildRequires: junit >= 3.8.1 BuildRequires: byaccj BuildRequires: java-cup BuildRequires: jflex BuildRequires: jmock +BuildRequires: junit >= 3.8.1 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,7 +82,6 @@ %if %{with_repolib} %package repolib -License: Apache-2.0 Summary: Artifacts to be uploaded to a repository library Group: Development/Libraries/Java @@ -100,7 +96,6 @@ %endif %package javadoc -License: Apache-2.0 Summary: Extract class/interface/method definitions from sources Group: Development/Libraries/Java @@ -113,12 +108,9 @@ %prep -%setup -q -n %{name} -chmod -Rf a+rX,u+w,g-w,o-w bootstrap -rm -r bootstrap -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q +# % patch1 -p1 +# % patch2 -p1 cp -p %{SOURCE5} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java sed -e "s/@VERSION@/%{version}/g" %{SOURCE6} > build.xml %if %{with_repolib} @@ -155,9 +147,10 @@ %else export OPT_JAR_LIST="junit ant/ant-junit" mkdir -p target/src/java/com/thoughtworks/qdox/parser/impl -export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java-cup jflex jmock junit) +export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java-cup jflex jmock) %{java} JFlex.Main \ -d src/java/com/thoughtworks/qdox/parser/impl \ + --skel src/grammar/skeleton.inner \ src/grammar/lexer.flex pushd target %{_bindir}/byaccj \ @@ -169,7 +162,7 @@ ../src/grammar/parser.y popd mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.sysclasspath=only jar javadoc +ant -Dbuild.sysclasspath=only jar javadoc %endif %install ++++++ qdox-build.xml ++++++ --- /var/tmp/diff_new_pack.K81ZaS/_old 2012-11-02 07:31:12.000000000 +0100 +++ /var/tmp/diff_new_pack.K81ZaS/_new 2012-11-02 07:31:12.000000000 +0100 @@ -16,7 +16,7 @@ </src> </javac> </target> - <target name="jar" depends="compile,test" description="Clean the JAR"> + <target name="jar" depends="compile" description="Clean the JAR"> <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/> </target> <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present"> ++++++ qdox-component-info.xml ++++++ --- /var/tmp/diff_new_pack.K81ZaS/_old 2012-11-02 07:31:12.000000000 +0100 +++ /var/tmp/diff_new_pack.K81ZaS/_new 2012-11-02 07:31:12.000000000 +0100 @@ -5,11 +5,11 @@ <component id="qdox" licenseType="ironsmith" - version="1.6.1-brew" + version="1.11" projectHome="http://qdox.codehaus.org/"; description="Parser for extracting class/interface/method definitions from source files complete with JavaDoc @tags." scm=":ext:cvs.devel.redhat.com:/cvs/dist/qdox" - tag="qdox-1_6_1-1jpp_ep1_4_el4"> + tag="qdox-1_11-1"> <!-- Built using JDK 1.4 --> <artifact id="qdox.jar"/> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
