From 7d0a23777c175fc81888b4151be886893a3fc9d7d9cf472e159dc14312e3edef Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Mon, 21 Jan 2013 13:55:33 +0000
Subject: [PATCH] - update to 7.0.35 (bugfix release)   require ecj >= 4.2.1,
 like upstream do - make gpg-offline work distros after 12.2

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=17
---
 apache-tomcat-7.0.33-src.tar.gz     |  3 ---
 apache-tomcat-7.0.33-src.tar.gz.asc | 17 -----------------
 apache-tomcat-7.0.35-src.tar.gz     |  3 +++
 apache-tomcat-7.0.35-src.tar.gz.asc | 17 +++++++++++++++++
 tomcat.changes                      |  7 +++++++
 tomcat.spec                         | 12 ++++++------
 6 files changed, 33 insertions(+), 26 deletions(-)
 delete mode 100644 apache-tomcat-7.0.33-src.tar.gz
 delete mode 100644 apache-tomcat-7.0.33-src.tar.gz.asc
 create mode 100644 apache-tomcat-7.0.35-src.tar.gz
 create mode 100644 apache-tomcat-7.0.35-src.tar.gz.asc

diff --git a/apache-tomcat-7.0.33-src.tar.gz b/apache-tomcat-7.0.33-src.tar.gz
deleted file mode 100644
index 69924bb..0000000
--- a/apache-tomcat-7.0.33-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f665b4b39471b6f7ddd10845058a76308694a8be24b7651971de86a34ca66243
-size 4240455
diff --git a/apache-tomcat-7.0.33-src.tar.gz.asc b/apache-tomcat-7.0.33-src.tar.gz.asc
deleted file mode 100644
index 458e6e3..0000000
--- a/apache-tomcat-7.0.33-src.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (MingW32)
-
-iQIcBAABAgAGBQJQqQr5AAoJEBDAHFovYFnn6QEQAL6HsUXF9gGxX909dmJtGiXg
-sD2TxSnS/U98GTcbqzhggSMBvL0I3h1bpKqPhtvYPg0BMP8Css7vL75Sv+rLOl9p
-CLEgdM6K4G0jr4CMdXiORchpRhcJXq5LNLim2SRq/QxpmYoUQxlR540TbViPcVoT
-q4lDGNIxsQVYemxgxHCaSqZHlGw1VhVWhIBdM/2wJt1WII9NgzoojqYOuIrJ7xJs
-y8KM6tzDgRbfR0SMXmEnSrAy/KJeDdLTgAMyagtvvHeLdDhEeK8egV5kjcQpmegE
-Qxd5ZrwYf/S8Wpv2ZuTzpBCRyyXj/8XaZI35OHQs5s1Kt95wGxeJgzI+YEK58KJb
-CzIFCoSns16RzqQdlAC1L1hTxsxZjVJBZtZYvd/V23YkJM9HWpy8yBURi0hn2+vj
-hVb+MqPXaMRq7Tcwxmo0Byvk0/V4djcFnk7zw1LfdamwXcchzLGHzw75BGSD0Q7C
-kcckBmwtwtpe6WaOsiycKoGmlOcTtCmLxnYCvjF5Tf68Z5Z+7opdj1Hwvmz1Z8oR
-cy68uTm0wye8RT7qbxln1YNVIM4bywWnGyCOevP1AusnO2gnoJjK2BROENHgvgVe
-2m3xB+PWe47VwPnAH/zt4xgd/ba3CSII6Y3DuBvJwRxGMl7s5FZwD8q9k5Lt8Qtf
-tvHSC/O5x597bXYY+2tC
-=gosr
------END PGP SIGNATURE-----
diff --git a/apache-tomcat-7.0.35-src.tar.gz b/apache-tomcat-7.0.35-src.tar.gz
new file mode 100644
index 0000000..ece4f9e
--- /dev/null
+++ b/apache-tomcat-7.0.35-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3eefa08c8600839f32555e9a306fe8f1232c05c846839ab6901e81e5a11fccac
+size 4264802
diff --git a/apache-tomcat-7.0.35-src.tar.gz.asc b/apache-tomcat-7.0.35-src.tar.gz.asc
new file mode 100644
index 0000000..78de7db
--- /dev/null
+++ b/apache-tomcat-7.0.35-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJQ70f3AAoJEBDAHFovYFnndL8QAJhY0MB2Rv/tiIS3bkfhPrsn
++uh9zIbzSgjAbALvOqht2KEa8jS68kNtv2ViPPaVilgT5839IlwJitcT6z33/Thq
+mA2SrPKZ7pfpYFmYKziTegabPA0JG5Wl/N3F0KkKQIylKsSnWTDj551Jw9Mml8Ja
+oD+DIfAXZlFSzYRy7t6aBj9BIDDxk7ppHNbdrgntUGb28LoEUFPtLTUTnoboyy8H
+n3jAw84LEQtlyNZxyYFsCSYfHlofjbJTKlcP1qRDv3/dKA12bjaBD2AX6ZeQ0+Wt
+rhRtY5II8T/c9A6rGcJ60wN/Vs1bunMYRWKBBDX36SNODiAYQvg5ZHfZJL6Oc0Q1
++uCK9Fw/LrI5odgtnP0MqOFjI4nYb8kpsvTUf3pWdQVlYAImEZ5dhsxa6B8wdrx7
+RGsXAWpiKFkcnFy+E6CYdHXfUs8+qr/b1wq+eKoL7+4YCYj3QlmbHksGh8X+3cMQ
+0U+AgMTAyoFRz6dgUdyhFukWDnc/mlso7aQMwvr5N/zp5qEe9hzSRMode9hHWYYB
+t2/TrDOfNBxW7PU1r0G7+Lpr9M3yS/pFH4Irb15HnvowKAa41Y1PC6cnAk6o+BMU
+czXlWmNMjGw/XIgQrRbOLCft+i5K+a8ZNWv8tfHu2AOrxxOVk9P29H1j7nqjtz9O
++3VEpHc0FdppWaisQNHr
+=Eqjf
+-----END PGP SIGNATURE-----
diff --git a/tomcat.changes b/tomcat.changes
index 8c73649..83e149c 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com
+
+- update to 7.0.35 (bugfix release)
+  require ecj >= 4.2.1, like upstream do
+- make gpg-offline work distros after 12.2
+
 -------------------------------------------------------------------
 Thu Dec 27 17:14:55 UTC 2012 - archie@dellroad.org
 
diff --git a/tomcat.spec b/tomcat.spec
index a605b52..542bc56 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 
 %define major_version 7
 %define minor_version 0
-%define micro_version 33
+%define micro_version 35
 
 %define packdname apache-tomcat-%{version}-src
 %define tcuid 91
@@ -84,11 +84,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 BuildRequires:  ant
-BuildRequires:  ecj >= 3.2.2
+BuildRequires:  ecj >= 4.2.1
 BuildRequires:  fdupes
 BuildRequires:  findutils
 BuildRequires:  geronimo-jaf-1_0_2-api
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} > 1220
 BuildRequires:  gpg-offline
 %endif
 BuildRequires:  jakarta-commons-collections
@@ -212,7 +212,7 @@ Group:          Productivity/Networking/Web/Servers
 Requires:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Requires:       %{name}-jsp-%{jspspec}-api = %{version}-%{release}
 Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
-Requires(post): ecj >= 3.2.2
+Requires(post): ecj >= 4.2.1
 Requires(post): jakarta-commons-collections-tomcat5
 Requires(post): jakarta-commons-dbcp-tomcat5
 Requires(post): jakarta-commons-pool-tomcat5
@@ -251,7 +251,7 @@ The ROOT and examples web applications for Apache Tomcat
 
 %prep
 
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} > 1220
 %gpg_verify %{S:1001}
 %endif