commit 9d29efaab92318b7f23787b9e1298cd10fe51925 Author: Michael Simacek msimacek@redhat.com Date: Mon Jan 19 10:20:15 2015 +0100
Update to upstream version 2.3.3-b02
generate_tarball.sh | 4 +--- glassfish-jsp-build-eclipse-compilers.patch | 20 -------------------- glassfish-jsp.spec | 15 +++++++++++---- sources | 4 +--- 4 files changed, 13 insertions(+), 30 deletions(-) --- diff --git a/generate_tarball.sh b/generate_tarball.sh index 5444d73..612ad6a 100755 --- a/generate_tarball.sh +++ b/generate_tarball.sh @@ -4,10 +4,8 @@ baseurl="https://svn.java.net/svn/jsp~svn/tags/" pkgname="javax.servlet.jsp"
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}/ - - - diff --git a/glassfish-jsp-build-eclipse-compilers.patch b/glassfish-jsp-build-eclipse-compilers.patch index c4ddf16..ac5d061 100644 --- a/glassfish-jsp-build-eclipse-compilers.patch +++ b/glassfish-jsp-build-eclipse-compilers.patch @@ -16,26 +16,6 @@ index 53db856..cec146f 100644 org/apache/jasper/compiler/AntJavaCompiler.java </exclude> <exclude> -@@ -299,14 +296,13 @@ - <version>2.3.1</version> - </dependency> - --<!-- -- Needed only if we include JDTJavaCompiler.java -+ - <dependency> -- <groupId>eclipse</groupId> -- <artifactId>jdtcore</artifactId> -+ <groupId>org.eclipse.jdt</groupId> -+ <artifactId>core</artifactId> - <version>3.1.0</version> -- <scope>compile</scope> -+ <scope>provided</scope> - </dependency> ----> -+ - </dependencies> - </project> diff --git a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java b/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java index 9008e9b..33b925e 100644 --- a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec index c0cf9e5..9cff8d2 100644 --- a/glassfish-jsp.spec +++ b/glassfish-jsp.spec @@ -1,15 +1,16 @@ %global artifactId javax.servlet.jsp %global jspspec 2.3 +%global reltag b02
Name: glassfish-jsp -Version: 2.3.2 -Release: 5%{?dist} +Version: 2.3.3 +Release: 0.1.%{reltag}%{?dist} Summary: Glassfish J2EE JSP API implementation
License: (CDDL or GPLv2 with exceptions) and ASL 2.0 URL: http://glassfish.org -Source0: %{artifactId}-%{version}.tar.xz +Source0: %{artifactId}-%{version}-%{reltag}.tar.xz # no source releases, but this will generate tarball for you from an # SVN tag Source1: generate_tarball.sh @@ -52,9 +53,12 @@ Summary: API documentation for %{name} %{summary}.
%prep -%setup -q -n %{artifactId}-%{version} +%setup -q -n %{artifactId}-%{version}-%{reltag} %patch0 -p1 %patch1 -p1 + +%pom_add_dep org.eclipse.jdt:core::provided + cp -p %{SOURCE2} LICENSE cp -p %{SOURCE3} cddllicense.txt
@@ -94,6 +98,9 @@ popd
%changelog +* Mon Jan 19 2015 Michael Simacek msimacek@redhat.com - 2.3.3-0.1.b02 +- Update to upstream version 2.3.3-b02 + * Mon Jun 9 2014 Alexander Kurtakov akurtako@redhat.com 2.3.2-5 - Rebuild to regen osgi metadata.
diff --git a/sources b/sources index a73c21b..1cfce25 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -750f58ec5aa643312ec92473fe229fe5 LICENSE.txt -265e3e379568abfce46dc731dbad9ef0 javax.servlet.jsp-2.3.2.tar.xz +4e0cfd420d8690cb42d60901dab390da javax.servlet.jsp-2.3.3-b02.tar.xz
java-sig-commits@lists.fedoraproject.org