pool/servletapi4
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 198700 from Java:packages

Browse Source 
jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/servletapi4?expand=0&rev=13
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:04:31 +00:00 committed by Git OBS Bridge
parent 470a76d178
commit 011d58041c
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servletapi4.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 9 11:06:21 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 25 16:34:45 CEST 2006 - dbornkessel@suse.de Mon Sep 25 16:34:45 CEST 2006 - dbornkessel@suse.de

33
servletapi4.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package servletapi4 (Version 4.0.4) # spec file for package servletapi4
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,11 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: servletapi4 Name: servletapi4
BuildRequires: ant java2-devel-packages xml-commons-apis BuildRequires: ant
BuildRequires: java2-devel-packages
BuildRequires: xml-commons-apis
%define base_name servletapi %define base_name servletapi
%define major_version 4 %define major_version 4
%define name %{base_name}%{major_version} %define name %{base_name}%{major_version}
@ -28,7 +28,7 @@ BuildRequires: ant java2-devel-packages xml-commons-apis
%define release 3jpp %define release 3jpp
%define section free %define section free
Version: 4.0.4 Version: 4.0.4
Release: 272 Release: 0
Summary: Java servlet and JSP implementation classes Summary: Java servlet and JSP implementation classes
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
@ -38,13 +38,13 @@ Url: http://jakarta.apache.org/tomcat/
Provides: servlet Provides: servlet
PreReq: /usr/sbin/update-alternatives PreReq: /usr/sbin/update-alternatives
BuildRequires: ant >= 1.2 BuildRequires: ant >= 1.2
BuildRequires: jpackage-utils > 1.4 BuildRequires: javapackages-tools
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: servlet4
Obsoletes: servlet23 Obsoletes: servlet23
Provides: servlet4 Obsoletes: servlet4
Provides: servlet23 Provides: servlet23
Provides: servlet4
%description %description
This subproject contains the source code for the implementation classes This subproject contains the source code for the implementation classes
@ -53,9 +53,8 @@ of the Java Servlet and JSP APIs (packages javax.servlet).
%package javadoc %package javadoc
License: Apache-2.0
Group: Development/Libraries/Java
Summary: Javadoc for servletapi4 Summary: Javadoc for servletapi4
Group: Development/Libraries/Java
PreReq: coreutils PreReq: coreutils
%description javadoc %description javadoc
@ -103,15 +102,3 @@ fi
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Mon Sep 25 2006 dbornkessel@suse.de
- fixes necessary to compile with Java 1.5.0
- set source="1.4" and target="1.4" for ant "javac" tasks
- set source="1.4" for ant "javadoc" tasks
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Sep 29 2005 dmueller@suse.de
- add norootforbuild
* Thu Sep 16 2004 skh@suse.de
- Fix prerequires
* Thu Sep 02 2004 skh@suse.de
- Initial package created with version 4.0.4 (JPackage 1.5)