diff --git a/javacc.spec b/javacc.spec index 460dc70..8ffa287 100644 --- a/javacc.spec +++ b/javacc.spec @@ -1,24 +1,63 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%define _with_gcj_support 1 + +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} + %define section free Name: javacc -Version: 3.2 -Release: 1jpp_7fc +Version: 4.0 +Release: 3jpp_1fc Epoch: 0 Summary: A parser/scanner generator for java License: BSD -Source0: javacc-3.2-src.tar.gz +Source0: javacc-4.0src-RHCLEAN.tar.gz Source1: javacc Source2: jjdoc Source3: jjtree URL: https://javacc.dev.java.net/ Group: Development/Code Generators BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +%if ! %{gcj_support} +BuildArch: noarch +%endif Requires: jpackage-utils >= 0:1.5 -BuildRequires: ant, /bin/bash -# libgcj aot-compiled native libraries -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 +BuildRequires: ant, /bin/bash, junit >= 0:3.8.1 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description Java Compiler Compiler (JavaCC) is the most popular parser generator for use @@ -43,7 +82,7 @@ Group: Development/Documentation Examples for %{name}. %prep -%setup -q +%setup -q -n %{name} cp %{SOURCE1} javacc cp %{SOURCE2} jjdoc cp %{SOURCE3} jjtree @@ -64,23 +103,39 @@ install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/usr/bin install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name} cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name} -aot-compile-rpm +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif %clean rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/rebuild-gcj-db +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif %postun -%{_bindir}/rebuild-gcj-db +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif %files %defattr(0644,root,root,0755) %{_javadir}/*.jar %doc LICENSE README -%attr(0755,root,root) /usr/bin/* -%attr(-,root,root) %{_libdir}/gcj/%{name} +%defattr(0755,root,root,0755) +/usr/bin/* + +%if %{gcj_support} +%attr(-,root,root) %{_libdir}/gcj/%{name}/javacc-4.0.jar.* +%endif %files manual %defattr(0644,root,root,0755) @@ -91,36 +146,18 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/* %changelog -* Wed Jul 12 2006 Jesse Keating - 0:3.2-1jpp_7fc -- rebuild +* Tue Jul 18 2006 Matthew Wringe - 0:4.0-3jpp_1fc +- Merged with upstream version +- Added conditional native compiling -* Fri Feb 10 2006 Jesse Keating - 0:3.2-1jpp_6fc -- bump again for double-long bug on ppc(64) +* Thu Apr 20 2006 Fernando Nasser - 0:4.0-2jpp +- First JPP 1.7 build -* Tue Feb 07 2006 Jesse Keating - 0:3.2-1jpp_5fc -- rebuilt for new gcc4.1 snapshot and glibc changes +* Fri Mar 31 2006 Sebastiano Vigna - 0:4.0-1jpp +- Updated to 4.0 -* Wed Dec 21 2005 Jesse Keating 0:3.2-1jpp_4fc -- rebuilt +* Sun Aug 23 2004 Randy Watler - 0:3.2-2jpp +- Rebuild with ant-1.6.2 -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Jul 19 2005 Gary Benson 0:3.2-1jpp_3fc -- Build on ia64, ppc64, s390 and s390x. -- Switch to aot-compile-rpm. - -* Tue Jul 05 2005 Andrew Overholt 0:3.2-1jpp_2fc -- Bump release for FC4 update. - -* Fri Jun 10 2005 Gary Benson 0:3.2-1jpp_1fc -- Rearrange how BC-compiled stuff is built and installed. - -* Thu Jun 9 2005 Andrew Overholt -- Natively-compile. - -* Thu Mar 4 2004 Frank Ch. Eigler 0:3.2-1jpp_1rh -- RH vacuuming - -* Fri Jan 30 2004 Sebastiano Vigna 0:3.2-1jpp +* Fri Jan 30 2004 Sebastiano Vigna 0:3.2-1jpp - First JPackage version