From a009d67842b1841338095505b9857219c50e62d68adfef3c1279ce7a53ffd730 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 3 Sep 2010 11:36:09 +0000
Subject: [PATCH] Accepting request 46995 from Java:packages

Copy from Java:packages/antlr based on submit request 46995 from user mvyskocil

OBS-URL: https://build.opensuse.org/request/show/46995
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr?expand=0&rev=15
---
 antlr-bootstrap.changes |  7 +++++++
 antlr-bootstrap.spec    | 13 ++++++-------
 antlr.spec              |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes
index 8d4cdea..dc9b79d 100644
--- a/antlr-bootstrap.changes
+++ b/antlr-bootstrap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 31 09:09:28 UTC 2010 - mvyskocil@suse.cz
+
+- Do not install antlr.jar to avoid conflicts with a regular
+  antlr-java packages. Packages using antlr-bootstrap needs to have
+  antlr-bootstrap in their CLASSPATH
+
 -------------------------------------------------------------------
 Mon Aug 23 08:18:40 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec
index f69ab33..2b1aca8 100644
--- a/antlr-bootstrap.spec
+++ b/antlr-bootstrap.spec
@@ -25,7 +25,7 @@ BuildRequires:  ecj-bootstrap >= 0.570
 %define       real_name antlr
 Summary:        Antlr for bootstrapping purposes
 Version:        2.7.7
-Release:        78
+Release:        79
 Url:            http://www.antlr.org
 Group:          Development/Libraries/Java
 License:        BSD3c ; Public Domain, Freeware
@@ -131,20 +131,19 @@ delBinaryFiles
 #>>> %install
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{non_bootstrap_name}.jar
-ln -sf %{_javadir}/%{non_bootstrap_name}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar
+%{__install} -d -m 0755 %{buildroot}%{_javadir}
+%{__install} -m 0644 %{name}.jar %{buildroot}%{_javadir}/
+%{__ln_s} -f %{_javadir}/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
 #<<<
 
 %clean
-rm -rf $RPM_BUILD_ROOT 
+%{__rm} -rf %{buildroot} 
 #>>> files
 
 %files
 %defattr(-,root,root)   
 #%dir %{_javadir}
-%{_javadir}/%{name}.jar
-%{_javadir}/%{non_bootstrap_name}.jar
+%{_javadir}/%{name}*.jar
 #<<<
 # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:
 
diff --git a/antlr.spec b/antlr.spec
index 67aa6e4..991bf39 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -22,7 +22,7 @@
 Name:           antlr
 Summary:        Another Tool for Language Recognition
 Version:        2.7.7
-Release:        78
+Release:        79
 License:        GPLv2+ ; Public Domain, Freeware ; MIT
 Url:            http://www.antlr.org/
 Group:          Development/Tools/Other
@@ -101,6 +101,7 @@ C++ runtime (libantlr.a) and a headers files of antlr
 
 %package -n     python-%{name}
 
+
 License:        GPLv2+ ; Public Domain, Freeware ; MIT
 Group:          Development/Tools/Other
 Summary:        ANother Tool for Language Recognition (python runtime)