OBS User unknown 2008-07-28 13:55:47 +00:00 committed by Git OBS Bridge
parent 907100280f
commit 95fdc3835f
2 changed files with 24 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 28 09:09:08 CEST 2008 - coolo@suse.de
- build without openjdk to avoid cycle
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 25 15:33:26 CEST 2006 - dbornkessel@suse.de Mon Sep 25 15:33:26 CEST 2006 - dbornkessel@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package servletapi5 (Version 5.0.18) # spec file for package servletapi5 (Version 5.0.18)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -10,8 +10,10 @@
# norootforbuild # norootforbuild
Name: servletapi5 Name: servletapi5
BuildRequires: ant java2-devel-packages xml-commons-apis BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap
#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2
%define base_name servletapi %define base_name servletapi
%define major_version 5 %define major_version 5
%define name %{base_name}%{major_version} %define name %{base_name}%{major_version}
@ -20,20 +22,21 @@ BuildRequires: ant java2-devel-packages xml-commons-apis
%define release 1jpp %define release 1jpp
%define section free %define section free
Version: 5.0.18 Version: 5.0.18
Release: 24 Release: 234
Summary: Java servlet and JSP implementation classes Summary: Java servlet and JSP implementation classes
License: Apache License: The Apache Software License
Group: Development/Libraries/Java Group: Development/Libraries/Java
Source: %{full_name}-5-src.tar.gz Source: %{full_name}-5-src.tar.gz
Patch150: java150_build.patch Patch150: java150_build.patch
URL: http://jakarta.apache.org/tomcat/ Url: http://jakarta.apache.org/tomcat/
Requires: /usr/sbin/update-alternatives Requires: /usr/sbin/update-alternatives
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Obsoletes: servlet4 #Obsoletes: servlet4
#Obsoletes: servlet23 #Obsoletes: servlet23
Provides: servlet Provides: servlet
Provides: servlet5 Provides: servlet24 Provides: servlet5
Provides: servlet24
%description %description
This subproject contains the source code for the implementation classes This subproject contains the source code for the implementation classes
@ -42,6 +45,7 @@ of the Java Servlet and JSP APIs (packages javax.servlet).
%package javadoc %package javadoc
License: The Apache Software License
Group: Development/Libraries/Java Group: Development/Libraries/Java
Summary: Javadoc for servletapi5 Summary: Javadoc for servletapi5
PreReq: coreutils PreReq: coreutils
@ -121,14 +125,16 @@ ln -s jsp-api-%{version} %{_javadocdir}/jsp-api
%ghost %doc %{_javadocdir}/%{name} %ghost %doc %{_javadocdir}/%{name}
%ghost %doc %{_javadocdir}/jsp-api %ghost %doc %{_javadocdir}/jsp-api
%changelog -n servletapi5 %changelog
* Mon Sep 25 2006 - dbornkessel@suse.de * Mon Jul 28 2008 coolo@suse.de
- build without openjdk to avoid cycle
* Mon Sep 25 2006 dbornkessel@suse.de
- java150 fixes: added target="1.4" and source="1.4" - java150 fixes: added target="1.4" and source="1.4"
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Thu Sep 29 2005 - dmueller@suse.de * Thu Sep 29 2005 dmueller@suse.de
- add norootforbuild - add norootforbuild
* Thu Sep 16 2004 - skh@suse.de * Thu Sep 16 2004 skh@suse.de
- Fix prerequires of javadoc subpackage - Fix prerequires of javadoc subpackage
* Thu Sep 02 2004 - skh@suse.de * Thu Sep 02 2004 skh@suse.de
- Initial package created with version 5.0.18 (JPackage 1.5) - Initial package created with version 5.0.18 (JPackage 1.5)