- Release: 3

- python runtime subpackage
- do not require gcc-java-tools, any jar implementation should be enough
- use the standard %{_javadir} macro
- use %{java_home} when building with javac

Changed files:
    antlr.spec -> 1.23.2.2

diff --git a/antlr.spec b/antlr.spec
index 2ea4cda07d3ff80dcd5a653837d7100b3117f9e9..3918f86f5b6ca1958b19dd1e74aa5fc935c4d66d 100644 (file)
--- a/antlr.spec
+++ b/antlr.spec
@@ -1,6 +1,7 @@
+%include /usr/lib/rpm/macros.java
 # TODO: 
 #  *  Add a csharp bindings subpacakge (feel free to do it)
-#  *  Package the python bindings as subpackage as well
+#  *  Package the Emacs an Jedit modes
 #
 # Conditional build:
 %bcond_with    javac   # use javac instead of gcj
@@ -9,7 +10,7 @@ Summary:       ANother Tool for Language Recognition
 Summary(pl):   Jeszcze jedno narzêdzie do rozpoznawania jêzyka
 Name:          antlr
 Version:       2.7.5
-Release:       2
+Release:       3
 License:       Public Domain
 Group:         Development/Tools
 Source0:       http://www.antlr.org/download/%{name}-%{version}.tar.gz
@@ -17,9 +18,11 @@ Source0:     http://www.antlr.org/download/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 URL:           http://www.antlr.org/
 BuildRequires: automake
+BuildRequires: libstdc++-devel
+BuildRequires: python
 %if !%{with javac}
 BuildRequires: gcc-java
-BuildRequires: gcc-java-tools
+BuildRequires: jar
 # gij is in gcc-java in Ac
 Requires:      gcc-java
 %else
@@ -31,8 +34,6 @@ Conflicts:    pccts < 1.33MR33-6
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     %{_datadir}/java
-
 %description
 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language
 tool that provides a framework for constructing recognizers, compilers, and
@@ -51,12 +52,23 @@ wyj
 ANTLR ma ¶wietne wsparcie dla tworzenia drzew, przechodzenia po
 drzewach oraz translacji.
 
+%package -n python-%{name}
+Summary:       ANTLR runtime library for Python
+Group:         Libraries/Python
+%pyrequires_eq python-modules
+
+%description -n python-%{name}
+ANTLR (ANother Tool for Language Recognition) runtime library for Python.
+
 %prep
 %setup -q
 %patch0 -p1 
 
 %build
-#export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}
+unset CLASSPATH || :
+unset JAVA_HOME || :
+
+%{?with_javac:export JAVA_HOME=%{java_home}}
 
 cp -f /usr/share/automake/config.sub scripts
 
@@ -68,14 +80,25 @@ cp -f /usr/share/automake/config.sub scripts
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{py_sitescriptdir}/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/antlr.jar $RPM_BUILD_ROOT%{_javalibdir}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-%{__sed} -i -e "s,ANTLR_JAR=.*,ANTLR_JAR=\"%{_javalibdir}/antlr.jar\",g" $RPM_BUILD_ROOT%{_bindir}/antlr
+%{__sed} -i -e "s,ANTLR_JAR=.*,ANTLR_JAR=\"%{_javadir}/antlr-%{version}.jar\",g" $RPM_BUILD_ROOT%{_bindir}/antlr
+
+mv $RPM_BUILD_ROOT{%{_datadir}/%{name}-%{version}/*.py,%{py_sitescriptdir}/%{name}}
+%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}
+rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/*.py
+
+rm -f $RPM_BUILD_ROOT%{_sbindir}/pyantlr.sh
+rm -f $RPM_BUILD_ROOT%{_libdir}/antlr*
+
+# TODO: install where Emacs and JEdit will look for that
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/*.{xml,el}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,5 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/antlr-config
 %{_includedir}/%{name}
 %{_libdir}/libantlr.a
+%{_datadir}/%{name}*
 # Don't separate it, antlr binary won't work without it
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
+
+%files -n python-%{name}
+%{py_sitescriptdir}/%{name}