From f19d9a7d4f46824cf3be704473398045a8fdf80f Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Feb 28 2013 14:49:54 +0000
Subject: Update to 9.0.0.RC2


---

diff --git a/0001-Use-standard-java.utils-package.patch b/0001-Use-standard-java.utils-package.patch
deleted file mode 100644
index 2674019..0000000
--- a/0001-Use-standard-java.utils-package.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00589384974dc728f9b6a05251f6c2d6ccf831a4 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-Date: Fri, 15 Feb 2013 10:47:52 +0100
-Subject: [PATCH] Use standard java.utils package
-
----
- .../src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
-index d7ce310..0b8aa41 100644
---- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
-+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
-@@ -20,12 +20,12 @@
- package org.eclipse.jetty.maven.plugin;
- 
- import java.util.ArrayList;
-+import java.util.Arrays;
- import java.util.Iterator;
- import java.util.List;
- 
- import org.codehaus.plexus.util.xml.Xpp3Dom;
- 
--import edu.emory.mathcs.backport.java.util.Arrays;
- 
- /**
-  * OverlayConfig
--- 
-1.8.1.2
-
diff --git a/jetty.spec b/jetty.spec
index d7a4ac6..e25622b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver RC0
+%global addver RC2
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -52,7 +52,7 @@
 
 Name:           jetty
 Version:        9.0.0
-Release:        0.1.%{addver}%{?dist}
+Release:        0.2.%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -65,7 +65,6 @@ Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
 Source5:        %{name}.service
 Patch0:         %{name}-create-work-dir.patch
-Patch1:         0001-Use-standard-java.utils-package.patch
 Patch4:         0004-Modify-dependencies.patch
 
 BuildRequires:  geronimo-annotation
@@ -439,12 +438,11 @@ License:        (ASL 2.0 or EPL) and MIT
 %{summary}.
 
 %prep
-%setup -q -n %{jettyname}.project-jetty-%{version}.%{addver}
+%setup -q -n %{jettyname}-%{version}.%{addver}
 for f in $(find . -name "*.?ar"); do rm $f; done
 find . -name "*.class" -exec rm {} \;
 
 %patch0 -p2 -b .sav
-%patch1 -p1 -b .sav
 %patch4 -p1 -b .sav
 
 # Use proper groupId for apache ant
@@ -456,6 +454,8 @@ find . -name "*.class" -exec rm {} \;
 %pom_disable_module tests
 %pom_disable_module examples
 %pom_disable_module test-jetty-osgi jetty-osgi/pom.xml
+%pom_disable_module test-jetty-osgi-context jetty-osgi/pom.xml
+%pom_disable_module test-jetty-osgi-webapp jetty-osgi/pom.xml
 
 # Since tests are disabled, we don't have some jars
 %pom_remove_dep :test-jetty-webapp jetty-distribution/pom.xml
@@ -764,6 +764,9 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Thu Feb 28 2013 Michal Srb <msrb@redhat.com> - 9.0.0-0.2.RC2
+- Update to 9.0.0.RC2
+
 * Fri Feb 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.0.0-0.1.RC0
 - Remove duplicated %%files for javadoc package
 - Add the new tarball to sources