From 0a81a0602a8c003d3f645fe551ba6ed5b3321a7f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Oct 2014 12:57:05 +0100 Subject: [PATCH] Update to upstream version 2.0-M2 --- .gitignore | 1 + qdox.spec | 96 ++++++++++++------------------------------------------ sources | 2 +- 3 files changed, 22 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 0ad20a0..0899cd7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ qdox-1.10.1.tar.bz2 qdox-1.11-project.tar.bz2 qdox-1.12-project.tar.bz2 /qdox-1.12.1-project.tar.bz2 +/qdox-2.0-M2-project.tar.gz diff --git a/qdox.spec b/qdox.spec index eb525d6..426927e 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,42 +1,14 @@ -# Copyright (c) 2000-2009, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +%global vertag M2 Summary: Extract class/interface/method definitions from sources Name: qdox -Version: 1.12.1 -Release: 10%{?dist} +Version: 2.0 +Release: 0.1.%{vertag}%{?dist} Epoch: 0 License: ASL 2.0 URL: http://qdox.codehaus.org/ -Group: Development/Libraries -Source0: http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2 + +Source0: http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}-%{vertag}/%{name}-%{version}-%{vertag}-project.tar.gz Source1: qdox-MANIFEST.MF BuildRequires: jpackage-utils >= 0:1.7.4 @@ -48,20 +20,10 @@ BuildRequires: byaccj BuildRequires: jflex BuildRequires: maven-local BuildRequires: maven-assembly-plugin -BuildRequires: maven-compiler-plugin BuildRequires: maven-changes-plugin -BuildRequires: maven-clean-plugin +BuildRequires: exec-maven-plugin +BuildRequires: maven-invoker-plugin BuildRequires: maven-plugin-cobertura -BuildRequires: maven-dependency-plugin -BuildRequires: maven-deploy-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-release-plugin -BuildRequires: zip Requires: java-headless >= 1:1.6.0 @@ -78,55 +40,34 @@ generators or documentation tools. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc API docs for %{name}. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{vertag} find -name *.jar -delete rm -rf bootstrap -# Ant changed groupId -%pom_remove_dep ant:ant -%pom_add_dep org.apache.ant:ant - -%pom_remove_dep jmock:jmock # We don't need these plugins -%pom_remove_plugin :maven-antrun-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-jflex-plugin -%pom_remove_plugin :maven-resources-plugin -%pom_remove_plugin :xsite-maven-plugin %pom_xpath_remove pom:build/pom:extensions %mvn_file : %{name} %mvn_alias : qdox:qdox -%build -# Generate scanner (upstream does this with maven-jflex-plugin) -jflex \ - -d src/java \ - --skel src/grammar/skeleton.inner \ - src/grammar/lexer.flex +%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' -# Generate parser (upstream does this with maven-antrun-plugin) -dir=src/java/com/thoughtworks/qdox/parser/impl -mkdir -p $dir -(cd ./$dir -byaccj \ - -v \ - -Jnorun \ - -Jnoconstruct \ - -Jclass=Parser \ - -Jsemantic=Value \ - -Jpackage=com.thoughtworks.qdox.parser.impl \ - ../../../../../../grammar/parser.y) +%build +# Generate scanners (upstream does this with maven-jflex-plugin) +jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex +jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex # Build artifact -%mvn_build -f +%mvn_build -f -- -Dqdox.byaccj.executable=byaccj # Inject OSGi manifests mkdir -p META-INF @@ -135,7 +76,7 @@ touch META-INF/MANIFEST.MF zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF %install -%mvn_install -J target/apidocs +%mvn_install %files -f .mfiles %doc LICENSE.txt README.txt @@ -144,6 +85,9 @@ zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF %doc LICENSE.txt %changelog +* Mon Oct 27 2014 Mikolaj Izdebski - 0:2.0-1.M2 +- Update to upstream version 2.0-M2 + * Sun Jun 08 2014 Fedora Release Engineering - 0:1.12.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index d8aef15..b5c6e79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69a60c49393894b5f037e34a91687e99 qdox-1.12.1-project.tar.bz2 +6fe749f471248897da464051f7ab998b qdox-2.0-M2-project.tar.gz