This commit is contained in:
commit
907100280f
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
BIN
jakarta-servletapi-5-src.tar.gz
(Stored with Git LFS)
Normal file
BIN
jakarta-servletapi-5-src.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
72
java150_build.patch
Normal file
72
java150_build.patch
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
Index: jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr152/build.xml
|
||||||
|
===================================================================
|
||||||
|
--- jakarta-tomcat-5.0.18-src.orig/jakarta-servletapi-5/jsr152/build.xml
|
||||||
|
+++ jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr152/build.xml
|
||||||
|
@@ -69,6 +69,7 @@
|
||||||
|
<!-- Java classes -->
|
||||||
|
<javac srcdir="src/share" destdir="${jsp-api.build}/classes"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
optimize="${compile.optimize}"
|
||||||
|
classpath="${servlet-api.jar}" />
|
||||||
|
|
||||||
|
@@ -97,6 +98,7 @@
|
||||||
|
|
||||||
|
<javadoc packagenames="javax.servlet.jsp.*"
|
||||||
|
sourcepath="${basedir}/src/share"
|
||||||
|
+ source="1.4"
|
||||||
|
classpath="${servlet-api.jar}"
|
||||||
|
destdir="${jsp-api.build}/docs/api"
|
||||||
|
use="true"
|
||||||
|
@@ -110,6 +112,7 @@
|
||||||
|
<!-- ======================== Build Examples =========================== -->
|
||||||
|
<target name="ant" depends="prepare">
|
||||||
|
<javac srcdir="src/ant" destdir="${jsp-api.build}/ant"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
optimize="${compile.optimize}"
|
||||||
|
classpath="${ant.home}/lib/ant.jar" />
|
||||||
|
@@ -200,6 +203,7 @@
|
||||||
|
</txt2html>
|
||||||
|
|
||||||
|
<javac srcdir="examples/WEB-INF/classes"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
destdir="${jsp-api.build}/examples/WEB-INF/classes"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
optimize="${compile.optimize}"
|
||||||
|
@@ -208,6 +212,7 @@
|
||||||
|
</javac>
|
||||||
|
|
||||||
|
<javac srcdir="examples/plugin/applet"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
destdir="${jsp-api.build}/examples/plugin/applet"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
optimize="${compile.optimize}"
|
||||||
|
Index: jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr154/build.xml
|
||||||
|
===================================================================
|
||||||
|
--- jakarta-tomcat-5.0.18-src.orig/jakarta-servletapi-5/jsr154/build.xml
|
||||||
|
+++ jakarta-tomcat-5.0.18-src/jakarta-servletapi-5/jsr154/build.xml
|
||||||
|
@@ -63,6 +63,7 @@
|
||||||
|
|
||||||
|
<!-- Java classes -->
|
||||||
|
<javac srcdir="src/share" destdir="${servlet-api.build}/classes"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
optimize="${compile.optimize}"/>
|
||||||
|
|
||||||
|
@@ -88,6 +89,7 @@
|
||||||
|
<target name="javadoc" depends="prepare" unless="docs.uptodate">
|
||||||
|
|
||||||
|
<javadoc packagenames="javax.servlet.*"
|
||||||
|
+ source="1.4"
|
||||||
|
sourcepath="${basedir}/src/share"
|
||||||
|
destdir="${servlet-api.build}/docs/api"
|
||||||
|
use="true"
|
||||||
|
@@ -108,6 +110,7 @@
|
||||||
|
</copy>
|
||||||
|
|
||||||
|
<javac srcdir="examples/WEB-INF/classes"
|
||||||
|
+ source="1.4" target="1.4"
|
||||||
|
destdir="${servlet-api.build}/examples/WEB-INF/classes"
|
||||||
|
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||||
|
optimize="${compile.optimize}"
|
25
servletapi5.changes
Normal file
25
servletapi5.changes
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 25 15:33:26 CEST 2006 - dbornkessel@suse.de
|
||||||
|
|
||||||
|
- java150 fixes: added target="1.4" and source="1.4"
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 25 21:47:50 CET 2006 - mls@suse.de
|
||||||
|
|
||||||
|
- converted neededforbuild to BuildRequires
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 29 00:12:09 CEST 2005 - dmueller@suse.de
|
||||||
|
|
||||||
|
- add norootforbuild
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 16 15:58:38 CEST 2004 - skh@suse.de
|
||||||
|
|
||||||
|
- Fix prerequires of javadoc subpackage
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 2 16:45:46 CEST 2004 - skh@suse.de
|
||||||
|
|
||||||
|
- Initial package created with version 5.0.18 (JPackage 1.5)
|
||||||
|
|
134
servletapi5.spec
Normal file
134
servletapi5.spec
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
#
|
||||||
|
# spec file for package servletapi5 (Version 5.0.18)
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
# This file and all modifications and additions to the pristine
|
||||||
|
# package are under the same license as the package itself.
|
||||||
|
#
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
Name: servletapi5
|
||||||
|
BuildRequires: ant java2-devel-packages xml-commons-apis
|
||||||
|
%define base_name servletapi
|
||||||
|
%define major_version 5
|
||||||
|
%define name %{base_name}%{major_version}
|
||||||
|
%define full_name jakarta-%{base_name}
|
||||||
|
%define version 5.0.18
|
||||||
|
%define release 1jpp
|
||||||
|
%define section free
|
||||||
|
Version: 5.0.18
|
||||||
|
Release: 24
|
||||||
|
Summary: Java servlet and JSP implementation classes
|
||||||
|
License: Apache
|
||||||
|
Group: Development/Libraries/Java
|
||||||
|
Source: %{full_name}-5-src.tar.gz
|
||||||
|
Patch150: java150_build.patch
|
||||||
|
URL: http://jakarta.apache.org/tomcat/
|
||||||
|
Requires: /usr/sbin/update-alternatives
|
||||||
|
BuildArch: noarch
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
#Obsoletes: servlet4
|
||||||
|
#Obsoletes: servlet23
|
||||||
|
Provides: servlet
|
||||||
|
Provides: servlet5 Provides: servlet24
|
||||||
|
|
||||||
|
%description
|
||||||
|
This subproject contains the source code for the implementation classes
|
||||||
|
of the Java Servlet and JSP APIs (packages javax.servlet).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
%package javadoc
|
||||||
|
Group: Development/Libraries/Java
|
||||||
|
Summary: Javadoc for servletapi5
|
||||||
|
PreReq: coreutils
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
This subproject contains the source code for the implementation classes
|
||||||
|
of the Java Servlet and JSP APIs (packages javax.servlet).
|
||||||
|
|
||||||
|
This package contains the javadoc documentation for the Java Servlet
|
||||||
|
and JSP APIs.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
%setup -q -c -T -a 0 -n %{full_name}-5-src
|
||||||
|
%patch150
|
||||||
|
|
||||||
|
%build
|
||||||
|
# Fix us a license file first
|
||||||
|
cp -f jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/LICENSE .
|
||||||
|
cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
|
||||||
|
find . -type f -name "*.jar" -exec rm -f {} \;
|
||||||
|
pushd .
|
||||||
|
cd jsr154
|
||||||
|
ant dist -Dservletapi.build=build -Dservletapi.dist=dist
|
||||||
|
popd
|
||||||
|
pushd .
|
||||||
|
cd jsr152
|
||||||
|
ant dist -Dservletapi.build=build -Dservletapi.dist=dist
|
||||||
|
popd
|
||||||
|
|
||||||
|
%install
|
||||||
|
cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
|
||||||
|
# jars
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||||
|
install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
|
||||||
|
install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
||||||
|
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||||
|
# javadoc jsp
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version}
|
||||||
|
cp -pr jsr152/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version}
|
||||||
|
ln -s jsp-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jsp-api # ghost symlink
|
||||||
|
# javadoc servlet
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||||
|
cp -pr jsr154/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||||
|
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%post
|
||||||
|
#update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 50
|
||||||
|
#update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/jsp-api-%{version}.jar 50
|
||||||
|
|
||||||
|
%postun
|
||||||
|
#if [ "$1" = "0" ]; then
|
||||||
|
# update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar
|
||||||
|
# update-alternatives --remove jsp %{_javadir}/jsp-api-%{version}.jar
|
||||||
|
#fi
|
||||||
|
|
||||||
|
%post javadoc
|
||||||
|
rm -f %{_javadocdir}/%{name}
|
||||||
|
rm -f %{_javadocdir}/jsp-api
|
||||||
|
ln -s %{name}-%{version} %{_javadocdir}/%{name}
|
||||||
|
ln -s jsp-api-%{version} %{_javadocdir}/jsp-api
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc LICENSE
|
||||||
|
%{_javadir}/*
|
||||||
|
|
||||||
|
%files javadoc
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc %{_javadocdir}/%{name}-%{version}
|
||||||
|
%doc %{_javadocdir}/jsp-api-%{version}
|
||||||
|
%ghost %doc %{_javadocdir}/%{name}
|
||||||
|
%ghost %doc %{_javadocdir}/jsp-api
|
||||||
|
|
||||||
|
%changelog -n servletapi5
|
||||||
|
* Mon Sep 25 2006 - dbornkessel@suse.de
|
||||||
|
- java150 fixes: added target="1.4" and source="1.4"
|
||||||
|
* 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 of javadoc subpackage
|
||||||
|
* Thu Sep 02 2004 - skh@suse.de
|
||||||
|
- Initial package created with version 5.0.18 (JPackage 1.5)
|
Loading…
Reference in New Issue
Block a user