diff --git a/antlr-pom.patch b/antlr-pom.patch
deleted file mode 100644
index 3369de7..0000000
--- a/antlr-pom.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -up ./gunit/pom.xml.pomfix ./gunit/pom.xml
---- ./gunit/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
-+++ ./gunit/pom.xml 2010-10-12 17:05:12.000000000 -0400
-@@ -142,16 +142,6 @@
- maven-surefire-plugin
-
-
--
-- org.codehaus.mojo
-- findbugs-maven-plugin
--
-- true
-- true
-- true
--
--
--
-
-
-
-diff -up ./pom.xml.pomfix ./pom.xml
---- ./pom.xml.pomfix 2009-09-23 14:46:18.000000000 -0400
-+++ ./pom.xml 2010-10-12 17:05:12.770549001 -0400
-@@ -146,25 +146,6 @@
-
-
-
--
-- org.codehaus.mojo
-- buildnumber-maven-plugin
--
-- {0,date,MMM dd, yyyy} {0,time,kk:mm:ss}
--
-- - timestamp
--
--
--
--
-- validate
--
-- create
--
--
--
--
--
-
- maven-compiler-plugin
-
-@@ -179,16 +160,6 @@
-
-
-
-- org.codehaus.mojo
-- findbugs-maven-plugin
--
-- true
-- true
-- true
--
--
--
--
-
-
-+ <_nouses>true
-+ antlr.org
-+ org.antlr.runtime
-+ org.antlr.*;version=${project.version}
-+
-+
-+
-+
-+
-+ bundle-manifest
-+ process-classes
-+
-+ manifest
-+
-+
-+
-+
-
-
-
-diff -up ./tool/pom.xml.pomfix ./tool/pom.xml
---- ./tool/pom.xml.pomfix 2009-09-23 14:50:28.000000000 -0400
-+++ ./tool/pom.xml 2010-10-12 17:05:12.000000000 -0400
-@@ -59,7 +59,7 @@
-
- org.antlr
- antlr3-maven-plugin
-- 3.1.3-1
-+ 3.2
-
- target/generated-sources/antlr/org/antlr/grammar/v3
-
-@@ -77,6 +77,7 @@
-
- org.codehaus.mojo
- antlr-maven-plugin
-+ 2.1
-
- src/main/antlr2/org/antlr/grammar/v2
- antlr.g codegen.g, antlr.print.g, assign.types.g, buildnfa.g, define.g
diff --git a/antlr-python-3.1.2-version.patch b/antlr-python-3.1.2-version.patch
deleted file mode 100644
index ee9800c..0000000
--- a/antlr-python-3.1.2-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- antlr_python_runtime-3.1.2/antlr3/recognizers.py.orig 2010-05-01 13:30:01.000000000 +0200
-+++ antlr_python_runtime-3.1.2/antlr3/recognizers.py 2010-05-01 13:36:00.000000000 +0200
-@@ -164,24 +164,20 @@
- self._state = state
-
- if self.antlr_version > runtime_version:
-- raise RuntimeError(
-- "ANTLR version mismatch: "
-- "The recognizer has been generated by V%s, but this runtime "
-- "is V%s. Please use the V%s runtime or higher."
-- % (self.antlr_version_str,
-- runtime_version_str,
-- self.antlr_version_str))
-+ print >> sys.stderr, """
-+ WARNING: ANTLR version mismatch:
-+ The recognizer has been generated by V%s, but this runtime
-+ is V%s, this may not work correctly. Please use the V%s runtime or higher.""" % (
-+ self.antlr_version_str, runtime_version_str, self.antlr_version_str)
- elif (self.antlr_version < (3, 1, 0, 0) and
- self.antlr_version != runtime_version):
- # FIXME: make the runtime compatible with 3.0.1 codegen
- # and remove this block.
-- raise RuntimeError(
-- "ANTLR version mismatch: "
-- "The recognizer has been generated by V%s, but this runtime "
-- "is V%s. Please use the V%s runtime."
-- % (self.antlr_version_str,
-- runtime_version_str,
-- self.antlr_version_str))
-+ print >> sys.stderr, """
-+ WARNING ANTLR version mismatch:
-+ The recognizer has been generated by V%s, but this runtime
-+ is V%s, this may not work correctly. Please use the V%s runtime.""" % (
-+ self.antlr_version_str, runtime_version_str, self.antlr_version_str)
-
- # this one only exists to shut up pylint :(
- def setInput(self, input):
diff --git a/antlr3.spec b/antlr3.spec
index 85408b4..a3808cc 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -6,44 +6,41 @@
%global python_runtime_version 3.1.3
%global javascript_runtime_version 3.1
-Summary: ANother Tool for Language Recognition
-Name: antlr3
-Version: %{antlr_version}
-Release: 2%{?dist}
-URL: http://www.antlr.org/
-Source0: http://www.antlr.org/download/antlr-%{antlr_version}.tar.gz
-Source1: http://www.antlr.org/download/C/libantlr3c-%{antlr_version}.tar.gz
-Source2: http://www.antlr.org/download/Python/antlr_python_runtime-%{python_runtime_version}.tar.gz
-Source3: http://www.antlr.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip
-Source5: antlr3
+Summary: ANother Tool for Language Recognition
+Name: antlr3
+Version: %{antlr_version}
+Release: 4%{?dist}
+URL: http://www.antlr.org/
+Source0: http://www.antlr.org/download/antlr-%{antlr_version}.tar.gz
+Source1: http://www.antlr.org/download/C/libantlr3c-%{antlr_version}.tar.gz
+Source2: http://www.antlr.org/download/Python/antlr_python_runtime-%{python_runtime_version}.tar.gz
+Source3: http://www.antlr.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip
+Source5: antlr3
%if %{with_bootstrap}
-Source6: settings.xml
-Source7: http://www.antlr.org/download/antlr-%{antlr_version}.jar
-Source8: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/antlr/antlr3-maven-plugin/%{antlr_version}/antlr3-maven-plugin-%{antlr_version}.jar
+Source6: settings.xml
+Source7: http://www.antlr.org/download/antlr-%{antlr_version}.jar
+Source8: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/antlr/antlr3-maven-plugin/%{antlr_version}/antlr3-maven-plugin-%{antlr_version}.jar
%endif
-# No buildnumber and findbugs:
-Patch0: antlr-pom.patch
-# Python version mismatch patch, to be possibly upstreamed:
-Patch1: antlr-python-3.1.2-version.patch
-License: BSD
-Group: Development/Libraries
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: antlr-maven-plugin
+License: BSD
+Group: Development/Libraries
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: antlr-maven-plugin
BuildRequires: maven
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-shared-reporting-impl
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: junit4
-BuildRequires: tomcat6-servlet-2.5-api
-BuildRequires: tomcat6
-BuildRequires: stringtemplate >= 3.2
-BuildRequires: stringtemplate4
-BuildRequires: felix-parent
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: buildnumber-maven-plugin
+BuildRequires: junit4
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: tomcat6
+BuildRequires: stringtemplate >= 3.2
+BuildRequires: stringtemplate4
+BuildRequires: felix-parent
%if ! %{with_bootstrap}
-BuildRequires: antlr3-tool >= 3.2
+BuildRequires: antlr3-tool >= 3.2
%endif
# we don't build it now
@@ -55,83 +52,83 @@ that provides a framework for constructing recognizers,
interpreters, compilers, and translators from grammatical
descriptions containing actions in a variety of target languages.
-%package tool
-Group: Development/Libraries
-Summary: ANother Tool for Language Recognition
-BuildArch: noarch
-Requires: jpackage-utils
-Requires: java >= 1:1.6.0
-Provides: %{name} = %{antlr_version}-%{release}
-Obsoletes: %{name} < %{antlr_version}-%{release}
-Requires: %{name}-java = %{antlr_version}-%{release}
-Requires: antlr
-Requires: stringtemplate >= 3.2
-Requires: stringtemplate4
-
-%description tool
+%package tool
+Group: Development/Libraries
+Summary: ANother Tool for Language Recognition
+BuildArch: noarch
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+Provides: %{name} = %{antlr_version}-%{release}
+Obsoletes: %{name} < %{antlr_version}-%{release}
+Requires: %{name}-java = %{antlr_version}-%{release}
+Requires: antlr
+Requires: stringtemplate >= 3.2
+Requires: stringtemplate4
+
+%description tool
ANother Tool for Language Recognition, is a language tool
that provides a framework for constructing recognizers,
interpreters, compilers, and translators from grammatical
descriptions containing actions in a variety of target languages.
-%package java
-Group: Development/Libraries
-Summary: Java run-time support for ANTLR-generated parsers
-BuildArch: noarch
-Requires: stringtemplate
-Requires: stringtemplate4
-Requires: jpackage-utils
-Requires: java >= 1:1.6.0
+%package java
+Group: Development/Libraries
+Summary: Java run-time support for ANTLR-generated parsers
+BuildArch: noarch
+Requires: stringtemplate
+Requires: stringtemplate4
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
-%description java
+%description java
Java run-time support for ANTLR-generated parsers
-%package javascript
-Group: Development/Libraries
-Summary: Javascript run-time support for ANTLR-generated parsers
-Version: %{javascript_runtime_version}
-BuildArch: noarch
+%package javascript
+Group: Development/Libraries
+Summary: Javascript run-time support for ANTLR-generated parsers
+Version: %{javascript_runtime_version}
+BuildArch: noarch
-%description javascript
+%description javascript
Javascript run-time support for ANTLR-generated parsers
-%package C
-Group: Development/Libraries
-Summary: C run-time support for ANTLR-generated parsers
+%package C
+Group: Development/Libraries
+Summary: C run-time support for ANTLR-generated parsers
-%description C
+%description C
C run-time support for ANTLR-generated parsers
-%package C-devel
-Group: Development/Libraries
-Summary: Header files for the C bindings for ANTLR-generated parsers
-Requires: %{name}-C = %{antlr_version}-%{release}
+%package C-devel
+Group: Development/Libraries
+Summary: Header files for the C bindings for ANTLR-generated parsers
+Requires: %{name}-C = %{antlr_version}-%{release}
-%description C-devel
+%description C-devel
Header files for the C bindings for ANTLR-generated parsers
-%package C-docs
-Group: Documentation
-Summary: API documentation for the C run-time support for ANTLR-generated parsers
-BuildArch: noarch
-BuildRequires: graphviz
-BuildRequires: doxygen
-Requires: %{name}-C = %{antlr_version}-%{release}
+%package C-docs
+Group: Documentation
+Summary: API documentation for the C run-time support for ANTLR-generated parsers
+BuildArch: noarch
+BuildRequires: graphviz
+BuildRequires: doxygen
+Requires: %{name}-C = %{antlr_version}-%{release}
-%description C-docs
+%description C-docs
This package contains doxygen documentation with instruction
on how to use the C target in ANTLR and complete API description of the
C run-time support for ANTLR-generated parsers.
-%package python
-Group: Development/Libraries
-Summary: Python run-time support for ANTLR-generated parsers
-BuildRequires: python-devel
-BuildRequires: python-setuptools-devel
-BuildArch: noarch
-Version: %{python_runtime_version}
+%package python
+Group: Development/Libraries
+Summary: Python run-time support for ANTLR-generated parsers
+BuildRequires: python-devel
+BuildRequires: python-setuptools-devel
+BuildArch: noarch
+Version: %{python_runtime_version}
-%description python
+%description python
Python run-time support for ANTLR-generated parsers
%prep
@@ -226,11 +223,11 @@ install -pm 644 antlr3-maven-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-
install -pm 644 gunit-maven-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-gunit-plugin.pom
# install jars
-install -m 644 runtime/Java/target/antlr-runtime-3.2.jar \
+install -m 644 runtime/Java/target/antlr-runtime-*.jar \
$RPM_BUILD_ROOT%{_datadir}/java/antlr3-runtime.jar
%add_maven_depmap JPP-antlr3-runtime.pom antlr3-runtime.jar
-install -m 644 tool/target/antlr-3.2.jar \
+install -m 644 tool/target/antlr-*.jar \
$RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar
%add_maven_depmap JPP-antlr3.pom antlr3.jar
@@ -253,7 +250,6 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/antlr3
# install python runtime
pushd antlr_python_runtime-%{python_runtime_version}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/antlr_python_runtime-*
popd
@@ -263,7 +259,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT%{_libdir}/libantlr3c.{a,la}
pushd api/man/man3
for file in `ls -1 * | grep -vi "^antlr3"`; do
- mv $file antlr3-$file
+ mv $file antlr3-$file
done
gzip *
popd
@@ -313,9 +309,16 @@ popd
%{_datadir}/antlr/
%changelog
-* Wed Feb 22 2012 Miloš Jakubíček - 3.4-2
+* Wed Feb 22 2012 Miloš Jakubíček - 3.4-4
- Fix permissions for egg-info dir (fixes BZ#790499)
+* Thu Feb 16 2012 Stanislav Ochotnicky - 3.4-3
+- Use wildcards for installing jars (different results on different releases)
+
+* Thu Feb 16 2012 Stanislav Ochotnicky - 3.4-2
+- Add builnumber plugin to buildrequires
+- Tab/space cleanup
+
* Mon Jan 23 2012 Stanislav Ochotnicky - 3.4-1
- Update antlr version to 3.4
- Move to maven3 build, update macros etc