PR#1: update to version 2.3.3 - rpms/glassfish-jsp-api

rpms / glassfish-jsp-api

#1 update to version 2.3.3

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

Fabio Valentini • 4 years ago

2f4209c

.gitignore

file modified

		`@@ -1,6 +1,10 @@`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`/javax.servlet.jsp-api-2.2.1.tar.xz`
		`/javax.servlet.jsp-api-2.3.1.tar.xz`
		`/javax.servlet.jsp-api-2.3.2-b01.tar.xz`
		`/LICENSE-2.0.txt`
		`/cddllicense.txt`
		`/LICENSE.html`
		`+ /javax.servlet.jsp-api-2.3.3.tar.gz`

generate_tarball.sh

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- baseurl="https://svn.java.net/svn/jsp~svn/tags/"`
		`- pkgname="javax.servlet.jsp-api"`
		`-`
		- version=`grep Version: spec \| sed -e 's/Version:\s$.*$/\1/'`
		- version="$version`sed -n 's/%global\s\+reltag\s\+/-/p' *.spec`"
		`- echo $version`
		`-`
		`- svn export "${baseurl}/${pkgname}-${version}"`
		`- tar cvJf ${pkgname}-${version}.tar.xz ${pkgname}-${version}/`

glassfish-jsp-api.spec

file modified

+22 -20

		`@@ -1,21 +1,14 @@`
		`%global artifactId javax.servlet.jsp-api`
		`- %global jspspec 2.2`
		`- %global reltag b01`
		`-`

		`Name: glassfish-jsp-api`
		`- Version: 2.3.2`
		`- Release: 0.12.%{reltag}%{?dist}`
		`+ Version: 2.3.3`
		`+ Release: 1%{?dist}`
		`Summary: Glassfish J2EE JSP API specification`
		`-`
		`License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0`
		`- URL: http://java.net/jira/browse/JSP`
		`- 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`
		`+`
		`+ URL: https://github.com/javaee/javaee-jsp-api`
		`+ Source0: %{url}/archive/%{artifactId}-%{version}.tar.gz`
		`+ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt`

		`BuildArch: noarch`

		`@@ -39,35 +32,44 @@`
		`%{summary}.`

		`%prep`
		`- %setup -q -n %{artifactId}-%{version}-%{reltag}`
		`+ %setup -q -n javaee-jsp-api-%{artifactId}-%{version}`

		`- cp -p %{SOURCE2} LICENSE-ASL-2.0.txt`
		`- cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html`
		`+ cp -p %{SOURCE1} LICENSE-ASL-2.0.txt`

		`+ pushd api`
		`# Submited upstream: http://java.net/jira/browse/JSP-31`
		`sed -i "/<bundle.symbolicName>/s/-api//" pom.xml`

		`%pom_xpath_remove "pom:dependency[pom:groupId='javax.el' or pom:groupId='javax.servlet']/pom:scope"`

		`+ %pom_remove_plugin :maven-gpg-plugin`
		`# javadoc generation fails due to strict doclint in JDK 8`
		`%pom_remove_plugin :maven-javadoc-plugin`

		`%mvn_alias : javax.servlet:jsp-api`
		`+ popd`

		`%build`
		`+ pushd api`
		`%mvn_build`
		`+ popd`

		`%install`
		`+ pushd api`
		`%mvn_install`
		`+ popd`

		`- %files -f .mfiles`
		`- %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html`
		`+ %files -f api/.mfiles`
		`+ %license LICENSE-ASL-2.0.txt LICENSE`

		`- %files javadoc -f .mfiles-javadoc`
		`- %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html`
		`+ %files javadoc -f api/.mfiles-javadoc`
		`+ %license LICENSE-ASL-2.0.txt LICENSE`


		`%changelog`
		`+ * Mon Oct 21 2019 Fabio Valentini <decathorpe@gmail.com> - 2.3.3-1`
		`+ - Update to version 2.3.3.`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.12.b01`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

sources

file modified

+1 -2

		`@@ -1,3 +1,2 @@`
		`- SHA512 (javax.servlet.jsp-api-2.3.2-b01.tar.xz) = 1e6c2b1c8455ae5a07741d5f1829895ee1eab80da03b035b7f902245389bfcec50b62ccf6bd1b898feb2d52dee220b7e199ad7deb862630e4a0450e9b813f6eb`
		`+ SHA512 (javax.servlet.jsp-api-2.3.3.tar.gz) = 0531d7b745e32ce2ca1e85d7090cd6d39d19e4239a58ca100942725c829b4a2476b4f73c31096566894ef3efa40319d44c88785ecb0c1ddb68c23ab61f21855c`
		`SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8`
		`- SHA512 (LICENSE.html) = 176884e014c4bd0ecc002b0d3dc9a720ba1fa2fe1ca58afbcf9021faaa113bdaaac737e402ad881eab54816c1f5a366673bf46a541c7af2e723fb25768479126`

decathorpe commented 4 years ago

update to latest version (2.3.2~b1 → 2.3.3)
use GitHub sources
adapt to new directory structure

Test rebuilds of recursively dependent packages were done in COPR and were successful:

https://copr.fedorainfracloud.org/coprs/decathorpe/glassfish-jsp-api-2.3.3-pr/monitor/

All build failures were expected and already happen in rawhide without this change.

dmoluguw commented 4 years ago

The source SHA match the upstream. This patch LGTM.

The current upstream project has been archived and it seems to have moved here: https://github.com/eclipse-ee4j/jsp-api/releases (note the change in name)

decathorpe commented 4 years ago

@dmoluguw thanks for the review!

Yes, the upstream project has been "moved", but it has also renamed the maven groupId:artifactId as soon as they did this move. Taking care of this in packaging would require some more work than a simple update.

Pull-Request has been merged by decathorpe

4 years ago