diff --git a/.gitignore b/.gitignore index 0652fc8..72cc997 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/javax.servlet.jsp-2.3.3-b02.tar.xz +SOURCES/javax.servlet.jsp-2.3.4.tar.gz diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec index 89b3216..518d7ef 100644 --- a/glassfish-jsp.spec +++ b/glassfish-jsp.spec @@ -1,101 +1,126 @@ %global artifactId javax.servlet.jsp %global jspspec 2.3 -%global reltag b02 Name: glassfish-jsp -Version: 2.3.3 -Release: 0.14.%{reltag}%{?dist} +Version: 2.3.4 +Release: 6%{?dist} 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 -URL: http://glassfish.org -BuildArch: noarch +URL: https://github.com/javaee/javaee-jsp-api -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 +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 + BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) BuildRequires: mvn(net.java:jvnet-parent:pom:) 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.glassfish:javax.el) Provides: jsp = %{jspspec} Provides: jsp%{jspspec} - Provides: javax.servlet.jsp -# make sure the symlinks will be correct -Requires: glassfish-jsp-api %description This project provides a container independent implementation of JSP -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. - +specification %{jspspec}. %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{name} %description javadoc %{summary}. %prep -%setup -q -n %{artifactId}-%{version}-%{reltag} +%setup -q -n javaee-jsp-api-%{artifactId}-%{version} + +cp -p %{SOURCE1} LICENSE-ASL-2.0.txt + +pushd impl %patch0 -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 -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" # compat symlink %mvn_file : %{name}/javax.servlet.jsp %{name} -# javadoc generation fails due to strict doclint in JDK 8 +# Plugins not needed for RPM builds: %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 -%mvn_build +pushd impl +%mvn_build -- -Dsource=1.8 -Ddoclint=none +popd %install +pushd impl %mvn_install +popd -# install j2ee api symlinks +# Install j2ee api symlinks install -d -m 755 %{buildroot}%{_javadir}/javax.servlet.jsp/ pushd %{buildroot}%{_javadir}/javax.servlet.jsp/ for jar in ../%{name}/*jar; do ln -sf $jar . done -# copy jsp-api so that build-classpath will include dep as well +# Copy jsp-api so that deps can be included as well build-jar-repository -p . glassfish-jsp-api xmvn-subst -R %{buildroot} -s . popd -%files -f .mfiles +%files -f impl/.mfiles %{_javadir}/javax.servlet.jsp -%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 +%license LICENSE-ASL-2.0.txt LICENSE +%files javadoc -f impl/.mfiles-javadoc +%license LICENSE-ASL-2.0.txt LICENSE %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.3.4-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jul 07 2020 Mat Booth - 2.3.4-5 +- Avoid javadoc problems restricting build to Java 8 + +* Fri Jun 26 2020 Jeff Johnston - 2.3.4-4 +- Set to use Java 1.8 as package needs javax.servlet + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 17 2019 Mat Booth - 2.3.4-2 +- Add extra license and patch comments + +* Tue Dec 17 2019 Mat Booth - 2.3.4-1 +- Update to version 2.3.4 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.3-0.15.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.3.3-0.14.b02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -205,4 +230,4 @@ popd - Fix whitespace * Wed Mar 21 2012 Stanislav Ochotnicky - 2.2.1-1 -- Initial version of the package +- Initial version of the package \ No newline at end of file diff --git a/sources b/sources index ee706bf..42235b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (javax.servlet.jsp-2.3.3-b02.tar.xz) = 228e18cd531f809cea50e1fae5cb37ad8077abee5b786a3c342299921d91f117c991d4a15019bf62b2454b09b030b1f4f7b3ed6b1e6a30885dc86b9c8c660fab +SHA1 (javax.servlet.jsp-2.3.4.tar.gz) = 0ae5081e9806d6a71ff9de3cacd34e048d5051f9