SPECS: java-cup.spec - removed some hacks that are no longer needed (SHELL=...

[pawelz]

Author: pawelz                       Date: Fri Apr  3 15:09:18 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed some hacks that are no longer needed (SHELL=/bin/sh,
  -Dbuild.compiler=extJavac)
- renamed from java_cup
- jdk bconds

---- Files affected:
SPECS:
   java-cup.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/java-cup.spec
diff -u SPECS/java-cup.spec:1.19 SPECS/java-cup.spec:1.20
--- SPECS/java-cup.spec:1.19	Thu Feb 19 16:46:54 2009
+++ SPECS/java-cup.spec	Fri Apr  3 17:09:12 2009
@@ -3,23 +3,32 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 #
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+#
 %include	/usr/lib/rpm/macros.java
 #
 %define		ver		0.11a
 %define		pkgver		0.11a-20060912
+%define		srcname		cup
 Summary:	Java-based Constructor of Useful Parsers
 Summary(pl.UTF-8):	Javowy konstruktor przydatnych analizatorów
-Name:		java_cup
+Name:		java-cup
 Version:	%{ver}
 Release:	2
 License:	BSD-like
 Group:		Development/Languages/Java
-Source0:	%{name}-%{pkgver}.tar.gz
+Source0:	java_cup-%{pkgver}.tar.gz
 # Source0-md5:	c9b26e0e6c1c02f2b37148c54b28cd8d
 URL:		http://www2.cs.tum.edu/projects/cup/
 BuildRequires:	ant >= 1.5
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun <= 1.5}
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Provides:	javacup
@@ -62,10 +71,9 @@
 unset CLASSPATH || :
 export JAVA_HOME="%{java_home}"
 
-%ant -Dbuild.compiler=extJavac dist
+%ant dist
 
 %if %{with javadoc}
-export SHELL=/bin/sh
 %javadoc -d dist/javadoc src/java_cup/*.java
 %endif
 
@@ -73,10 +81,10 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
-cp dist/java-cup-11a.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp dist/java-cup-11a-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
-ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -sf %{name}-runtime-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime.jar
+cp dist/java-cup-11a.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp dist/java-cup-11a-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime-%{version}.jar
+ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+ln -sf %{srcname}-runtime-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime.jar
 
 # javadoc
 %if %{with javadoc}
@@ -107,6 +115,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2009/04/03 15:09:12  pawelz
+- removed some hacks that are no longer needed (SHELL=/bin/sh,
+  -Dbuild.compiler=extJavac)
+- renamed from java_cup
+- jdk bconds
+
 Revision 1.19  2009/02/19 15:46:54  pawelz
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-cup.spec?r1=1.19&r2=1.20&f=u