pool/antlr
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 555067 from home:dimstar:Factory

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2017-12-07 19:58:59 +00:00 committed by Git OBS Bridge
parent e8b0e01575
commit f6b6b1f37f
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
antlr-bootstrap.changes
View File

@ -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 Mon Oct 9 09:56:54 UTC 2017 - fstrba@suse.com

4
antlr-bootstrap.spec
View File

@ -16,7 +16,7 @@
# #
%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc-java) %define gccbinsuffix %(rpm -q --qf "-%%{VERSION}" gcc-java)
%define real_name antlr %define real_name antlr
Name: antlr-bootstrap Name: antlr-bootstrap
Version: 2.7.7 Version: 2.7.7
@ -37,7 +37,7 @@ This antlr package is used for bootstrapping purposes only.
%prep %prep
%setup -q -n %{real_name}-%{version} %setup -q -n %{real_name}-%{version}
find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
%build %build
#>>> some useful functions ... used throughout bootstrap packages #>>> some useful functions ... used throughout bootstrap packages

6
antlr.changes
View File

@ -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 Fri Nov 3 10:03:12 UTC 2017 - mpluskal@suse.com

2
antlr.spec
View File

@ -115,7 +115,7 @@ cp -p %{SOURCE1} build.xml
#Ensure that the manuals are installed in the correct openSUSE docpath #Ensure that the manuals are installed in the correct openSUSE docpath
%patch2 %patch2
# check for license problematic files: # check for license problematic files:
find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
%build %build
ant \ ant \