commit 8c830caa28dfc3492f59f2d6d5b24658fe0d9fed
Author: gil <puntogil(a)libero.it>
Date: Thu May 9 13:43:17 2013 +0200
update to 2.3.2
.gitignore | 1 +
grizzly.spec | 22 +++++++++++++++-------
sources | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77d5749..7efd533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/grizzly-2.3.1.tar.xz
+/grizzly-2.3.2.tar.xz
diff --git a/grizzly.spec b/grizzly.spec
index 09d1777..7665b09 100644
--- a/grizzly.spec
+++ b/grizzly.spec
@@ -1,15 +1,15 @@
%global namedreltag %{nil}
%global namedversion %{version}%{?namedreltag}
Name: grizzly
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?dist}
Summary: Java NIO Server Framework
Group: Development/Libraries
# see Grizzly_THIRDPARTYLICENSEREADME.txt
-License: BSD and CDDL and GPLv2 with exceptions and Public Domain
+License: (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain
URL:
http://grizzly.java.net/
# git clone
git://java.net/grizzly~git
-# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.1/ 2_3_1 | xz
> ../grizzly-2.3.1.tar.xz)
+# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.2/ 2_3_2 | xz
> ../grizzly-2.3.2.tar.xz)
Source0: %{name}-%{namedversion}.tar.xz
# forcing the use of required glassfish-servlet-api 3.1 apis
Source1: %{name}-2.3-beta8-depmap
@@ -24,13 +24,13 @@ Patch2: %{name}-2.3-rc4-ServletOutputStreamImpl.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: jvnet-parent
BuildRequires: felix-osgi-compendium
BuildRequires: felix-osgi-core
BuildRequires: glassfish-gmbal
BuildRequires: glassfish-servlet-api
+# BuildRequires: jboss-servlet-3.0-api
# test deps
# BuildRequires: jersey
@@ -53,9 +53,9 @@ BuildRequires: maven-war-plugin
Requires: glassfish-gmbal
Requires: glassfish-servlet-api
+# Requires: jboss-servlet-3.0-api
Requires: java
-Requires: jpackage-utils
BuildArch: noarch
# config
@@ -75,7 +75,6 @@ build scalable and robust servers using NIO.
Group: Development/Libraries
Summary: Grizzly samples
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
%description samples
This package contains samples for %{name}.
@@ -83,7 +82,6 @@ This package contains samples for %{name}.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -132,6 +130,10 @@ find . -name '*.class' -delete
%pom_xpath_remove "pom:build/pom:extensions/pom:extension[pom:artifactId =
'wagon-webdav']"
# jetty-npn
https://bugzilla.redhat.com/show_bug.cgi?id=953055
+
+# org.glassfish.main.common:glassfish-api:4.0-b72
+# org.glassfish.main.common:internal-api:4.0-b72
+# org.glassfish.grizzly:grizzly-npn-api:1.0
%pom_disable_module spdy modules
%pom_remove_dep org.glassfish.grizzly:documentation bom
@@ -280,6 +282,12 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
%changelog
+* Sat May 04 2013 gil cattaneo <puntogil(a)libero.it> 2.3.2-1
+- update to 2.3.2
+
+* Sat Apr 20 2013 gil cattaneo <puntogil(a)libero.it> 2.3.1-2
+- fix License tag
+
* Wed Apr 17 2013 gil cattaneo <puntogil(a)libero.it> 2.3.1-1
- update to 2.3.1
diff --git a/sources b/sources
index 4ce8077..3c86aa2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e9d10165729465862f363e4584c986e grizzly-2.3.1.tar.xz
+6a5ddbdc07fa331ddcf2b01b9f78a475 grizzly-2.3.2.tar.xz