From cd8689e8b12c62520760404893c0c5c6c4c5bb01 Mon Sep 17 00:00:00 2001 From: Tom "spot" Callaway Date: Mar 07 2011 19:54:08 +0000 Subject: 2.2 --- diff --git a/.gitignore b/.gitignore index f5fae41..cc7439f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /antlr-maven-plugin-20101012svn12849.tar.bz2 +/antlr-maven-plugin-2.2.tar.bz2 diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec index e0f7bd4..206b585 100644 --- a/antlr-maven-plugin.spec +++ b/antlr-maven-plugin.spec @@ -1,21 +1,21 @@ -%global svndate 20101012 -%global svnver 12849 +%global svndate 20110307 +%global svnver 13719 %global svnstring %{svndate}svn%{svnver} Name: antlr-maven-plugin -Version: 2.1 -Release: 3.%{svnstring}%{?dist} +Version: 2.2 +Release: 1.%{svnstring}%{?dist} Summary: Maven plugin that generates files based on grammar file(s) License: ASL 2.0 URL: http://mojo.codehaus.org/antlr-maven-plugin/ Group: Development/Libraries # No source tarball known. # Checked out from SVN -# svn export https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.1 antlr-maven-plugin -# tar cfj antlr-maven-plugin-20101012svn12849.tar.bz2 antlr-maven-plugin -Source0: %{name}-%{svnstring}.tar.bz2 +# svn export https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.2 antlr-maven-plugin +# tar cfj antlr-maven-plugin-2.2.tar.bz2 antlr-maven-plugin +Source0: %{name}-%{version}.tar.bz2 # Modern modello expects to see , even if there is only one. -Patch0: maven-antlr-plugin-2.1-modello-issue.patch +Patch0: maven-antlr-plugin-2.2-modello-issue.patch # Add maven-artifact to the pom.xml, we need it to build Patch1: maven-antlr-plugin-2.1-artifact.patch # siteRenderer.createSink doesn't exist anymore @@ -40,6 +40,8 @@ BuildRequires: maven-release-plugin BuildRequires: maven-site-plugin BuildRequires: maven-source-plugin BuildRequires: maven-plugin-bundle +BuildRequires: maven-plugin-cobertura +BuildRequires: apache-commons-exec Requires: antlr Requires: jpackage-utils Requires: java >= 1:1.6.0 @@ -117,6 +119,9 @@ rm -rf %{buildroot} %{_javadocdir}/%{name} %changelog +* Mon Mar 3 2011 Tom Callaway 2.2-1.20110307svn13719 +- update to 2.2 tag + * Wed Oct 13 2010 Tom "spot" Callaway 2.1-3.20101012svn12849 - fix provides/obsoletes to replace old (dead) package - don't own mavendepmapfragdir, just the files inside it diff --git a/maven-antlr-plugin-2.2-modello-issue.patch b/maven-antlr-plugin-2.2-modello-issue.patch new file mode 100644 index 0000000..8f0cb7c --- /dev/null +++ b/maven-antlr-plugin-2.2-modello-issue.patch @@ -0,0 +1,12 @@ +diff -up antlr-maven-plugin/pom.xml.BAD antlr-maven-plugin/pom.xml +--- antlr-maven-plugin/pom.xml.BAD 2011-03-07 13:18:45.219217017 -0500 ++++ antlr-maven-plugin/pom.xml 2011-03-07 13:18:57.498217062 -0500 +@@ -132,7 +132,7 @@ + + + 1.0.0 +- src/main/mdo/antlrOptions.mdo ++ src/main/mdo/antlrOptions.mdo + + + diff --git a/sources b/sources index d4f5882..bb07f26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7bdfc5dac7e1aa9ecad5c86afa7a9ad antlr-maven-plugin-20101012svn12849.tar.bz2 +2229ab165062b3c922653c6f1de893b9 antlr-maven-plugin-2.2.tar.bz2