Hello community, here is the log from the commit of package qdox for openSUSE:Leap:15.2 checked in at 2020-02-05 07:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/qdox (Old) and /work/SRC/openSUSE:Leap:15.2/.qdox.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qdox" Wed Feb 5 07:22:36 2020 rev:17 rq:762676 version:2.0.M9 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/qdox/qdox.changes 2020-01-15 15:55:00.887651947 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.qdox.new.26092/qdox.changes 2020-02-05 07:22:37.246574937 +0100 @@ -1,0 +2,29 @@ +Mon Apr 8 11:22:57 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Do not depend on the parent pom, since we are not building + using Maven. + +------------------------------------------------------------------- +Tue Jan 15 08:46:08 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- BuildRequires: java-cup-bootstrap and jflex-bootstrap to avoid + build cycle (bsc#1121958) + +------------------------------------------------------------------- +Wed Jan 9 22:28:49 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Use noun phrase in summary, and trim bias from descriptions. + +------------------------------------------------------------------- +Tue Jan 1 12:48:23 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Update to version 2.0-M9 + * Changed API to use Collections and Lists instead of Arrays + * No upstream changelog provided :/ + +------------------------------------------------------------------- +Mon Oct 29 10:51:58 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Install and package the maven artifact + +------------------------------------------------------------------- Old: ---- pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl qdox-1.12.1.tar.xz qdox-1.6-jpp-depmap.xml qdox-LocatedDef.java qdox-build.xml qdox-component-info.xml New: ---- qdox-2.0-M9-project.tar.gz qdox-MANIFEST.MF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qdox.spec ++++++ --- /var/tmp/diff_new_pack.IMpSL8/_old 2020-02-05 07:22:37.630575099 +0100 +++ /var/tmp/diff_new_pack.IMpSL8/_new 2020-02-05 07:22:37.634575101 +0100 @@ -1,7 +1,7 @@ # # spec file for package qdox # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,120 +12,108 @@ # 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 repodir %{_javadir}/repository.jboss.com/qdox/1.6.1-brew -%define repodirlib %{repodir}/lib -%define repodirsrc %{repodir}/src +%global vertag M9 +%global verbase 2.0 Name: qdox -Version: 1.12.1 +Version: %{verbase}.%{vertag} Release: 0 -Summary: Extract class/interface/method definitions from sources +Summary: Tool to extract class/interface/method definitions from sources License: Apache-2.0 Group: Development/Libraries/Java -Url: http://qdox.codehaus.org/ -# svn checkout https://svn.codehaus.org/qdox/tags/qdox-1.12.1 qdox-1.12.1 -# tar --exclude-vcs -cJf qdox-1.12.1.tar.xz qdox-1.12.1 -Source0: qdox-%{version}.tar.xz -Source1: pom-maven2jpp-depcat.xsl -Source2: pom-maven2jpp-newdepmap.xsl -Source3: pom-maven2jpp-mapdeps.xsl -Source4: qdox-1.6-jpp-depmap.xml -Source5: qdox-LocatedDef.java -Source6: qdox-build.xml -Source7: qdox-component-info.xml -BuildRequires: ant >= 1.6 +URL: https://github.com/paul-hammant/qdox +Source0: http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{verbase}-%{vertag}/%{name}-%{verbase}-%{vertag}-project.tar.gz +Source1: qdox-MANIFEST.MF BuildRequires: byaccj -BuildRequires: gpg2 +BuildRequires: fdupes BuildRequires: java-cup-bootstrap -BuildRequires: javapackages-tools +BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: jflex-bootstrap -BuildRequires: xz -Obsoletes: %{name}-javadoc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -QDox is a high speed, small footprint parser for extracting -class/interface/method definitions from source files complete with -JavaDoc @tags. It is designed to be used by active code generators or -documentation tools. - -%package repolib -Summary: Artifacts to be uploaded to a repository library -Group: Development/Libraries/Java - -%description repolib -QDox is a high speed, small footprint parser for extracting -class/interface/method definitions from source files complete with -JavaDoc @tags. It is designed to be used by active code generators or -documentation tools. +QDox is a parser for extracting class/interface/method definitions +from source files complete with JavaDoc @tags. It is designed to be +used by active code generators or documentation tools. %package javadoc -Summary: Extract class/interface/method definitions from sources +Summary: Javadoc for %{name} Group: Development/Libraries/Java %description javadoc -QDox is a high speed, small footprint parser for extracting -class/interface/method definitions from source files complete with -JavaDoc @tags. It is designed to be used by active code generators or -documentation tools. +API docs for %{name}. %prep -%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 -tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` -sed -i "s/@TAG@/$tag/g" %{SOURCE7} +%setup -q -n %{name}-%{verbase}-%{vertag} +find -name *.jar -delete +find -name *.class -delete +rm -rf bootstrap + +# We don't need these plugins +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin :maven-jflex-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' + +%pom_remove_parent . %build -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) -java JFlex.Main \ - -d src/java/com/thoughtworks/qdox/parser/impl \ - --skel src/grammar/skeleton.inner \ - src/grammar/lexer.flex -pushd target -%{_bindir}/byaccj \ - -Jnorun \ - -Jnoconstruct \ - -Jclass=Parser \ - -Jsemantic=Value \ +# Generate scanners (upstream does this with maven-jflex-plugin) +# Add the --inputstreamctor option if jflex is upgraded to a version 1.6 or higher +CLASSPATH=$(build-classpath java-cup) \ + jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex +CLASSPATH=$(build-classpath java-cup) \ + jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex + +# Generate the parsers using the command-line that the exec-maven-plugin uses +GRAMMAR_PATH=$(pwd)/src/grammar/commentparser.y && \ + (cd src/main/java/com/thoughtworks/qdox/parser/impl && \ + byaccj -v -Jnorun -Jnoconstruct -Jclass=DefaultJavaCommentParser \ + -Jpackage=com.thoughtworks.qdox.parser.impl ${GRAMMAR_PATH}) +GRAMMAR_PATH=$(pwd)/src/grammar/parser.y && \ + (cd src/main/java/com/thoughtworks/qdox/parser/impl && \ + byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser \ + -Jimplements=CommentHandler -Jsemantic=Value \ -Jpackage=com.thoughtworks.qdox.parser.impl \ - ../src/grammar/parser.y -popd -mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl -rm -f src/java/com/thoughtworks/qdox/junit/APITestCase.java -ant -Dant.build.javac.source=6 -Dant.build.javac.target=6 -Dbuild.sysclasspath=only jar + -Jstack=500 ${GRAMMAR_PATH}) + +# Build artifact +mkdir -p build/classes +javac -d build/classes -source 6 -target 6 \ + $(find src/main/java -name \*.java) +jar cf build/%{name}-%{verbase}-%{vertag}.jar -C build/classes . + +# Inject OSGi manifests +jar ufm build/%{name}-%{verbase}-%{vertag}.jar %{SOURCE1} + +mkdir -p build/apidoc +javadoc -d build/apidoc -source 6 -notimestamp $(find src/main/java -name \*.java) %install -# jars -mkdir -p %{buildroot}%{_javadir} -cp -p target/%{name}-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -install -d -m 755 %{buildroot}%{repodir} -install -d -m 755 %{buildroot}%{repodirlib} -install -p -m 644 %{SOURCE7} %{buildroot}%{repodir}/component-info.xml -install -d -m 755 %{buildroot}%{repodirsrc} -install -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc} -cp -p %{buildroot}%{_javadir}/qdox.jar %{buildroot}%{repodirlib} - -%files -%defattr(0644,root,root,0755) -%doc LICENSE.txt -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar - -%files repolib -%defattr(0644,root,root,0755) -%{repodir} -%dir %{_datadir}/java/repository.jboss.com/%{name} -%dir %{_datadir}/java/repository.jboss.com/ +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 build/%{name}-%{verbase}-%{vertag}.jar %{buildroot}%{_javadir}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a qdox:qdox +# javadoc +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -aL build/apidoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE.txt +%doc README.md + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE.txt %changelog ++++++ qdox-MANIFEST.MF ++++++ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-Name: %pluginName Bundle-SymbolicName: com.thoughtworks.qdox Bundle-Version: 1.6.3.v20081201-1400 Export-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3" Bundle-ManifestVersion: 2 Import-Package: junit.framework;version="[3.8.2,4.0.0)";resolution:=op tional,org.apache.tools.ant;version="[1.7.0,2.0.0)";resolution:=optio nal,org.apache.tools.ant.types;version="[1.7.0,2.0.0)";resolution:=op tional
