Accepting request 555129 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/555129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr?expand=0&rev=40

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
 

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

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
 

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 \