From f6b6b1f37f9ed12c525f787d9c4c4925f61ac73bc4a270918325996cec83fbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 7 Dec 2017 19:58:59 +0000
Subject: [PATCH] Accepting request 555067 from home:dimstar:Factory

- Escape the usage of %{VERSION} when calling out to rpm.
  RPM 4.14 has %{VERSION} defined as 'the main packages version'.

- Fix build with RPM 4.14: a command that exits with error > 0
  aborts the build (and grep not finding a string is retval 1).

OBS-URL: https://build.opensuse.org/request/show/555067
OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=46
---
 antlr-bootstrap.changes | 6 ++++++
 antlr-bootstrap.spec    | 4 ++--
 antlr.changes           | 6 ++++++
 antlr.spec              | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes
index 9818390..ab9b098 100644
--- a/antlr-bootstrap.changes
+++ b/antlr-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  7 11:38:17 UTC 2017 - dimstar@opensuse.org
+
+- Escape the usage of %{VERSION} when calling out to rpm.
+  RPM 4.14 has %{VERSION} defined as 'the main packages version'.
+
 -------------------------------------------------------------------
 Mon Oct  9 09:56:54 UTC 2017 - fstrba@suse.com
 
diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec
index 8beac02..cfd669a 100644
--- a/antlr-bootstrap.spec
+++ b/antlr-bootstrap.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc-java)
+%define gccbinsuffix %(rpm -q --qf "-%%{VERSION}" gcc-java)
 %define real_name antlr
 Name:           antlr-bootstrap
 Version:        2.7.7
@@ -37,7 +37,7 @@ This antlr package is used for bootstrapping purposes only.
 
 %prep
 %setup -q -n %{real_name}-%{version}
-find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42
+find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
 
 %build
 #>>> some useful functions ... used throughout bootstrap packages
diff --git a/antlr.changes b/antlr.changes
index a14b727..555f989 100644
--- a/antlr.changes
+++ b/antlr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  7 14:35:50 UTC 2017 - dimstar@opensuse.org
+
+- Fix build with RPM 4.14: a command that exits with error > 0
+  aborts the build (and grep not finding a string is retval 1).
+
 -------------------------------------------------------------------
 Fri Nov  3 10:03:12 UTC 2017 - mpluskal@suse.com
 
diff --git a/antlr.spec b/antlr.spec
index 9679796..68ea90c 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -115,7 +115,7 @@ cp -p %{SOURCE1} build.xml
 #Ensure that the manuals are installed in the correct openSUSE docpath
 %patch2
 # check for license problematic files:
-find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42
+find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
 
 %build
 ant \