SPECS: commons-el.spec - bootstrap not needed anymore

[glen]

Author: glen                         Date: Wed Apr 11 20:49:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bootstrap not needed anymore

---- Files affected:
SPECS:
   commons-el.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/commons-el.spec
diff -u SPECS/commons-el.spec:1.2 SPECS/commons-el.spec:1.3
--- SPECS/commons-el.spec:1.2	Wed Apr 11 08:38:45 2007
+++ SPECS/commons-el.spec	Wed Apr 11 22:49:20 2007
@@ -1,20 +1,14 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	bootstrap	# bootstrap (using binary servletapi5/jsp)
-#
 %include	/usr/lib/rpm/macros.java
 Summary:	The Jakarta Commons Extension Language
 Summary(pl.UTF-8):	Jakarta Commons Extension Language - język rozszerzeń Jakarta Commons
 Name:		commons-el
 Version:	1.0
-Release:	0.1
+Release:	1
 License:	Apache Software License
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/el/source/%{name}-%{version}-src.tar.gz
 # Source0-md5:	25038283a0b5f638db5e891295d20020
-Source1:	http://www.apache.org/dist/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip
-# Source1-md5:	4a7e5c2ff3c20a114fbfc5a122d7247c
 Patch0:		%{name}-license.patch
 Patch1:		%{name}-ant.patch
 URL:		http://jakarta.apache.org/commons/el/
@@ -23,10 +17,8 @@
 BuildRequires:	junit
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-%if %{without bootstrap}
 BuildRequires:	jsp
 BuildRequires:	servletapi5
-%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,28 +43,16 @@
 Dokumentacja javadoc dla commons-el.
 
 %prep
-%setup -q -n %{name}-%{version}-src %{?with_bootstrap:-a1}
+%setup -q -n %{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
-%if %{with bootstrap}
-ln -s apache-tomcat-* tomcat
-%endif
 
 %build
-%if %{with bootstrap}
-dir=$(pwd)
-servlet_api=$dir/tomcat/common/lib/servlet-api.jar
-jsp_api=$dir/tomcat/common/lib/jsp-api.jar
-%else
-servlet_api=$(build-classpath build-classpath servletapi5)
-jsp_api=$(build-classpath build-classpath jspapi)
-%endif
-
 cat > build.properties <<EOF
 build.compiler=modern
+servlet-api.jar=$(build-classpath servlet-api)
+jsp-api.jar=$(build-classpath jsp-api)
 junit.jar=$(build-classpath junit)
-servlet-api.jar=$servlet_api
-jsp-api.jar=$jsp_api
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 EOF
@@ -123,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/04/11 20:49:20  glen
+- bootstrap not needed anymore
+
 Revision 1.2  2007/04/11 06:38:45  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/commons-el.spec?r1=1.2&r2=1.3&f=u