- fix docdir packaging

[packages/antlr.git] / antlr.spec

diff --git a/antlr.spec b/antlr.spec
index 0598021c94871d6f5ddbe69394abcf28928e8684..947ca74f498210e30b3523ef83c580a667c48785 100644 (file)
--- a/antlr.spec
+++ b/antlr.spec
@@ -2,6 +2,10 @@
 #  - add python bcond
 #  - package the Emacs and Jedit modes
 #
+# NOTE:
+#  - next version is packaged as antlr3.spec. Please, do not upgrade this spec
+#    to 3.
+#
 # Conditional build:
 %bcond_without gcj     # use javac instead of GCJ
 %bcond_without dotnet  # don't build .NET modules
@@ -9,7 +13,7 @@
 #
 %{?with_dotnet:%include        /usr/lib/rpm/macros.mono}
 #
-%ifarch i586 i586 i686 athlon %{x8664}
+%ifarch i486 i586 i686 athlon %{x8664}
 %undefine      with_gcj
 %endif
 #
@@ -17,13 +21,14 @@ Summary:    ANother Tool for Language Recognition
 Summary(pl.UTF-8):     Jeszcze jedno narzędzie do rozpoznawania języka
 Name:          antlr
 Version:       2.7.7
-Release:       6
+Release:       13
 License:       Public Domain
 Group:         Development/Tools
 Source0:       http://www.antlr2.org/download/%{name}-%{version}.tar.gz
 # Source0-md5: 01cc9a2a454dd33dcd8c856ec89af090
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-strcasecmp.patch
+Patch2:                %{name}-gentoo.patch
 URL:           http://www.antlr2.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -39,6 +44,7 @@ BuildRequires:        jar
 BuildRequires: jdk
 Requires:      jpackage-utils
 %endif
+Requires:      jre
 %endif
 Conflicts:     pccts < 1.33MR33-6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -102,6 +108,7 @@ Przykładowe programy używające ANTLR.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub scripts
@@ -141,6 +148,8 @@ rm $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/*.py
 
 %{__sed} -i -e "s,ANTLR_JAR=.*,ANTLR_JAR=\"%{_javadir}/antlr.jar\",g" $RPM_BUILD_ROOT%{_bindir}/antlr
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT