Accepting request 232216 from home:deadpoint:branches:Java:packages

Fix buidarch, permissions, and bytecode issues on SLES.

OBS-URL: https://build.opensuse.org/request/show/232216
OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=22
This commit is contained in:
Duncan Mac-Vicar 2014-04-30 15:26:10 +00:00 committed by Git OBS Bridge
parent de1cf189fb
commit 9b259141e3
3 changed files with 25 additions and 5 deletions

View File

@ -2,7 +2,7 @@
#
# spec file for package antlr-bootstrap
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Apr 30 13:58:14 UTC 2014 - darin@darins.net
- Set buildarch on SLE_11 or the python subpackage is packaged
as noarch when they need be arch specific.
http://lists.opensuse.org/opensuse-packaging/2014-04/msg00055.html
-------------------------------------------------------------------
Tue Apr 29 12:54:39 UTC 2014 - darin@darins.net
- supporess bytecode version check on SLE
- fix perms for SLES
-------------------------------------------------------------------
Mon Sep 9 11:05:26 UTC 2013 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package antlr
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -49,6 +49,11 @@ Obsoletes: %{name}-bootstrap < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
# force package arch for SLE_11
%if 0%{?suse_version} == 1110
BuildArch: %{_arch}
%endif
%description
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
language tool that provides a framework for constructing recognizers,
@ -113,7 +118,6 @@ This package provides the C++ runtime (libantlr.a) and a headers files
of antlr
%package -n python-%{name}
Summary: ANother Tool for Language Recognition (python runtime)
Group: Development/Tools/Other
Requires: antlr
@ -150,6 +154,9 @@ make
# % {makeinstall}
# The upstream make install just installs a files to more or less random location
# instead of fixing it, let's install it in %%install section
%if 0%{?suse_version} == 1110
export NO_BRP_CHECK_BYTECODE_VERSION=true
%endif
#### jars ###
install -d -m 0755 %{buildroot}%{_javadir}
@ -196,7 +203,7 @@ rm -rf %{buildroot}
%files
%defattr(0644,root,root,0755)
%doc %attr(644,-,-) LICENSE.txt README.txt CHANGES.txt
%doc LICENSE.txt README.txt CHANGES.txt
%dir %{_datadir}/%{name}-%{version}
%defattr(0755,root,root,0755)
%{_bindir}/antlr
@ -217,7 +224,7 @@ rm -rf %{buildroot}
%doc %{_javadocdir}/%{name}
%files devel
%defattr(0644,root,root)
%defattr(0644,root,root,0755)
%attr(755,root,root) %{_libdir}/libantlr.a
%{_includedir}/%{name}