[jetty] Update to upstream version 9.2.6
Michael Šimáček
msimacek at fedoraproject.org
Fri Jan 2 16:01:54 UTC 2015
commit ec1edc129bb8a3bd6966108d1f612632ddf6bb8b
Author: Michael Simacek <msimacek at redhat.com>
Date: Mon Dec 22 14:06:57 2014 +0100
Update to upstream version 9.2.6
jetty.spec | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index a497e4a..a5c5b6f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20140905
+%global addver v20141205
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,8 +54,8 @@
%endif
Name: jetty
-Version: 9.2.3
-Release: 2%{?dist}
+Version: 9.2.6
+Release: 3%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -212,6 +212,12 @@ Summary: ant module for Jetty
%description ant
%{extdesc} %{summary}.
+%package cdi
+Summary: Jetty CDI Configuration
+
+%description cdi
+%{extdesc} %{summary}.
+
%package client
Summary: client module for Jetty
@@ -705,6 +711,9 @@ find %{buildroot}%{homedir}/ -name '*.jar' -delete
ln -sf $(build-classpath glassfish-servlet-api) \
%{buildroot}%{homedir}/lib/servlet-api-3.1.jar
+ln -sf $(build-classpath jetty-schemas)\
+ %{buildroot}%{homedir}/lib/jetty-schemas-3.1.jar
+
build-jar-repository %{buildroot}%{homedir}/lib/annotations \
objectweb-asm/asm-all geronimo-annotation
@@ -717,21 +726,14 @@ build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
ln -sf $(build-classpath jboss-transaction-1.2-api) \
%{buildroot}%{homedir}/lib/jndi/
-for module in jetty-ant jetty-util jetty-jmx jetty-io jetty-http \
-jetty-continuation jetty-server jetty-xml jetty-security jetty-servlet \
-jetty-webapp jetty-websocket jetty-servlets jetty-util-ajax jetty-maven-plugin \
-jetty-jspc-maven-plugin jetty-deploy jetty-start jetty-plus jetty-annotations \
-jetty-jndi jetty-jsp jetty-jaas jetty-spring jetty-client jetty-proxy \
-jetty-jaspi jetty-osgi jetty-rewrite jetty-nosql jetty-monitor \
-jetty-http-spi; do
- ln -s %{_javadir}/%{name}/$module.jar \
- %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar
-done
-
-for module in websocket-common websocket-api websocket-client websocket-server \
-websocket-servlet javax-websocket-client-impl javax-websocket-server-impl; do
- ln -s %{_javadir}/%{name}/$module.jar \
- %{buildroot}%{homedir}/lib/websocket/$module-%{version}.%{addver}.jar
+for jar in %{_javadir}/%{name}/*.jar; do
+ mod=`basename -s .jar $jar`
+ if [[ $mod == *-websocket* ]]; then
+ target="%{buildroot}%{homedir}/lib/websocket/${mod%%jetty-}-%{version}.%{addver}.jar"
+ else
+ target="%{buildroot}%{homedir}/lib/$mod-%{version}.%{addver}.jar"
+ fi
+ ln -s $jar $target
done
( cat << EO_RC
@@ -831,6 +833,7 @@ exit 0
%files annotations -f .mfiles-jetty-annotations
%files ant -f .mfiles-jetty-ant
+%files cdi -f .mfiles-jetty-cdi
%files client -f .mfiles-jetty-client
%files continuation -f .mfiles-jetty-continuation
%files deploy -f .mfiles-jetty-deploy
@@ -891,6 +894,11 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Thu Dec 11 2014 Michael Simacek <msimacek at redhat.com> - 9.2.6-3
+- Update to upstream version 9.2.6
+- Simplify symlink creation
+- Include symlink to jetty-schemas (RHBZ#1170829)
+
* Fri Oct 10 2014 Michael Simacek <msimacek at redhat.com> - 9.2.3-2
- Add missing requires jetty-start
More information about the scm-commits
mailing list