Compare commits

..

No commits in common. "stream-tycho-rhel8-rhel-8.9.0" and "c8" have entirely different histories.

9 changed files with 42 additions and 69 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/javax.servlet.jsp-2.3.4.tar.gz SOURCES/javax.servlet.jsp-2.3.3-b02.tar.xz
/javax.servlet.jsp-2.3.4.tar.gz

View File

@ -1 +1 @@
0ae5081e9806d6a71ff9de3cacd34e048d5051f9 javax.servlet.jsp-2.3.4.tar.gz 022890811a1d3800183884e48354429eca93a67f SOURCES/javax.servlet.jsp-2.3.3-b02.tar.xz

View File

@ -1,126 +1,101 @@
%global artifactId javax.servlet.jsp %global artifactId javax.servlet.jsp
%global jspspec 2.3 %global jspspec 2.3
%global reltag b02
Name: glassfish-jsp Name: glassfish-jsp
Version: 2.3.4 Version: 2.3.3
Release: 6%{?dist} Release: 0.14.%{reltag}%{?dist}
Summary: Glassfish J2EE JSP API implementation Summary: Glassfish J2EE JSP API implementation
# Classes in package "org.apache.jasper" are Apache licensed
License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0 License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
URL: https://github.com/javaee/javaee-jsp-api URL: http://glassfish.org
Source0: https://github.com/javaee/javaee-jsp-api/archive/%{artifactId}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# JSP can do byte-code compilation at runtime, if we enable the Eclipse compiler support
Patch0: %{name}-build-eclipse-compilers.patch
# Fix compilation errors due to unimplemented interfaces in newer servlet APIs
Patch1: %{name}-port-to-servlet-3.1.patch
BuildArch: noarch BuildArch: noarch
Source0: %{artifactId}-%{version}-%{reltag}.tar.xz
# no source releases, but this will generate tarball for you from an
# SVN tag
Source1: generate_tarball.sh
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
Source3: https://javaee.github.io/glassfish/LICENSE.html
Patch0: %{name}-build-eclipse-compilers.patch
Patch1: %{name}-port-to-servlet-3.1.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api)
BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(net.java:jvnet-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.eclipse.jdt:core) BuildRequires: mvn(org.eclipse.jdt:core)
BuildRequires: mvn(org.glassfish:javax.el) BuildRequires: mvn(org.glassfish:javax.el)
Provides: jsp = %{jspspec} Provides: jsp = %{jspspec}
Provides: jsp%{jspspec} Provides: jsp%{jspspec}
Provides: javax.servlet.jsp Provides: javax.servlet.jsp
# make sure the symlinks will be correct
Requires: glassfish-jsp-api
%description %description
This project provides a container independent implementation of JSP This project provides a container independent implementation of JSP
specification %{jspspec}. 2.3. The main goals are:
* Improves current implementation: bug fixes and performance
improvements
* Provides API for use by other tools, such as Netbeans
* Provides a sandbox for new JSP features; provides a reference
implementation of next JSP spec.
%package javadoc %package javadoc
Summary: API documentation for %{name} Summary: API documentation for %{name}
%description javadoc %description javadoc
%{summary}. %{summary}.
%prep %prep
%setup -q -n javaee-jsp-api-%{artifactId}-%{version} %setup -q -n %{artifactId}-%{version}-%{reltag}
cp -p %{SOURCE1} LICENSE-ASL-2.0.txt
pushd impl
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8"
%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8"
%pom_add_dep org.eclipse.jdt:core::provided %pom_add_dep org.eclipse.jdt:core::provided
cp -p %{SOURCE2} LICENSE-ASL-2.0.txt
cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html
%mvn_alias : "org.eclipse.jetty.orbit:org.apache.jasper.glassfish" %mvn_alias : "org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
# compat symlink # compat symlink
%mvn_file : %{name}/javax.servlet.jsp %{name} %mvn_file : %{name}/javax.servlet.jsp %{name}
# Plugins not needed for RPM builds: # javadoc generation fails due to strict doclint in JDK 8
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-gpg-plugin
%pom_remove_plugin :maven-source-plugin
# These three files are excluded from compilation by upstream, delete them to avoid javadoc problems
rm src/main/java/org/apache/jasper/compiler/AntJavaCompiler.java \
src/main/java/org/apache/jasper/util/SystemLogHandler.java \
src/main/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
popd
%build %build
pushd impl %mvn_build
%mvn_build -- -Dsource=1.8 -Ddoclint=none
popd
%install %install
pushd impl
%mvn_install %mvn_install
popd
# Install j2ee api symlinks # install j2ee api symlinks
install -d -m 755 %{buildroot}%{_javadir}/javax.servlet.jsp/ install -d -m 755 %{buildroot}%{_javadir}/javax.servlet.jsp/
pushd %{buildroot}%{_javadir}/javax.servlet.jsp/ pushd %{buildroot}%{_javadir}/javax.servlet.jsp/
for jar in ../%{name}/*jar; do for jar in ../%{name}/*jar; do
ln -sf $jar . ln -sf $jar .
done done
# Copy jsp-api so that deps can be included as well # copy jsp-api so that build-classpath will include dep as well
build-jar-repository -p . glassfish-jsp-api build-jar-repository -p . glassfish-jsp-api
xmvn-subst -R %{buildroot} -s . xmvn-subst -R %{buildroot} -s .
popd popd
%files -f impl/.mfiles %files -f .mfiles
%{_javadir}/javax.servlet.jsp %{_javadir}/javax.servlet.jsp
%license LICENSE-ASL-2.0.txt LICENSE %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
%files javadoc -f .mfiles-javadoc
%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
%files javadoc -f impl/.mfiles-javadoc
%license LICENSE-ASL-2.0.txt LICENSE
%changelog %changelog
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.3.4-6
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Jul 07 2020 Mat Booth <mat.booth@redhat.com> - 2.3.4-5
- Avoid javadoc problems restricting build to Java 8
* Fri Jun 26 2020 Jeff Johnston <jjohnstn@redhat.com> - 2.3.4-4
- Set to use Java 1.8 as package needs javax.servlet
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Dec 17 2019 Mat Booth <mat.booth@redhat.com> - 2.3.4-2
- Add extra license and patch comments
* Tue Dec 17 2019 Mat Booth <mat.booth@redhat.com> - 2.3.4-1
- Update to version 2.3.4
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-0.15.b02
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-0.14.b02 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-0.14.b02
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +0,0 @@
SHA512 (javax.servlet.jsp-2.3.4.tar.gz) = 727d230f918f56b9c7ef6db25dc51edcb89b10fce9d41ea2a0ffefc03df6a5bdc73412602c4891ebdb2882ce43893f3d4a87e71e8e03e0ea72b05b0ca841069a