From 841c5082d3506ae5058af80310c1a7f61eb1e7cc74359bf2d03cdd2a0195c576 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Tue, 23 Jul 2013 14:35:12 +0000
Subject: [PATCH] - update to 7.0.42 (bugfix release)   see
 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html - fix file list to be
 compatible for new rpm

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

diff --git a/apache-tomcat-7.0.39-src.tar.gz b/apache-tomcat-7.0.39-src.tar.gz
deleted file mode 100644
index 725cdde..0000000
--- a/apache-tomcat-7.0.39-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d
-size 4295207
diff --git a/apache-tomcat-7.0.39-src.tar.gz.asc b/apache-tomcat-7.0.39-src.tar.gz.asc
deleted file mode 100644
index 1a1ad6e..0000000
--- a/apache-tomcat-7.0.39-src.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (MingW32)
-
-iQIcBAABAgAGBQJRTFF7AAoJEBDAHFovYFnnDm4P/ifNvkjNTbPMrDBrWGxXu5NT
-nqr8P5VGeIJkLrKa5yc107rWZm7A/IJRjvaXu1rn1dz7gA+xKfCHCBjYd1VKo0h+
-f0ZQVFoY592MhF73wQ5IgFFalTIVfeaydq1jTml+8cuWPUUw4Li1ejvWwF7/JPQJ
-QgyDxGNQKYt6UvJrByI6nONA4PVbcPMBqt9DOxIo+JC1ToOgWVIK5IyvC3PHC+aF
-sEP8izTT/8frdxvH1km1yhv7lmfmeGnjkJDUtVY4DYRCWpH4AnAGJpTZTRj65gwf
-Cxjxf508mKmPrE7tRJwyCQKQcd+6M/ei0xvR3xJeOXwaxzC7cJQT36I+p9V6Hqlt
-7J50CjnCyR9kbHm7bU13WJK28DBJ0QEEWtJZrfb3oolWrE5r2xmPKfPX5rfXyXz5
-rhQgjs2QuvtjVNTV3pcr3ogZwhpborYYz56WG3nDA21vATjJb9FlUN87ovMgIGJH
-8LHrDfJaD/0m7Btvgz1b41z7FFQcbUqJH7WUiTw8s4ala7t55vG5tsZCn9UXfCtv
-5Gb7miXcz/C2aeSIyU9QpyGNPk6jw+kQjK7TgB+5J8jZlYiBmdFGVl5JIdsrMRxS
-f++frff2ov8FlD4Wxqr1+5VPSHf9vPNPAbg2rXJxI+whxKQi7cf0OybNsUPJ1lDX
-CJad5mKFG+WqaViAZ5Dx
-=IQvN
------END PGP SIGNATURE-----
diff --git a/apache-tomcat-7.0.42-src.tar.gz b/apache-tomcat-7.0.42-src.tar.gz
new file mode 100644
index 0000000..0846428
--- /dev/null
+++ b/apache-tomcat-7.0.42-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72
+size 4422120
diff --git a/apache-tomcat-7.0.42-src.tar.gz.asc b/apache-tomcat-7.0.42-src.tar.gz.asc
new file mode 100644
index 0000000..83620f2
--- /dev/null
+++ b/apache-tomcat-7.0.42-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJR0okBAAoJEBDAHFovYFnnOGIP/0BLyBwPIDb0SiYtTNJPEW1x
+SP0DXVHO66ptX5kmGcTBVEUdPsRDL5hl4Uhg38v/CCu9osmtb/TYrg1zQ/DNcZN4
+5MtXZ++ciRIrOHLYGaehzEKnz8K5b8G3dC6K3oECQfXLDKsHBwI939Ms9nBmJ92/
+MpZzuP0KVI4TKWGdSSe6z5ffShVW4poHPS4ie8TJxp+fUWi7B4h17xK4H1xynZXo
+1e3AY5HCnK+7PFJSq8vhhAITmOsg+DXbwEL3r057dvbpTltd9SgIqdCbCf7xWDVY
+iI/GplGMgNiUw1TGnmmdqA0eyBwzuFp/zdh2/M/X3cQ25dAOV/7Do9e9FWwA9Xj5
+X1u8e0Emcm1VmbVnbky+WokFExVcMa87pH0Im2DDhw4xltoTGrzExFfPVgmiFV56
++6YIUsHUS+rnLUXhosGIPnNHkE3lhbkkQ9UhvxMNOQpoTFwzT5yUhBKCfXLtxgil
+OIY7yysAfgMQq9ziRBQ9k39sqHonTBUrsH+NDEdr/fVD6FQtVkykeviRact2nh26
+y6+Am2yqK/+Xbn7lRgZCYMdi3T1mZmFZvVm4/oa1/HdySjmdY1quwgznHDkkzEI3
+na76VnLtVsx0JwnildUwRku2uyGmXT+LniD3Yrc9HixNG4jQXCxEbN4VDI5Nweh7
+WiiE3SKwQGGDhVaNkxmN
+=i6GQ
+-----END PGP SIGNATURE-----
diff --git a/tomcat.changes b/tomcat.changes
index 329d8f3..dec7bb4 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 23 14:33:47 UTC 2013 - mvyskocil@suse.com
+
+- update to 7.0.42 (bugfix release)
+  see http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+- fix file list to be compatible for new rpm
+
 -------------------------------------------------------------------
 Thu Apr 18 12:23:13 UTC 2013 - mvyskocil@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 3359818..59156ed 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -26,7 +26,7 @@
 
 %define major_version 7
 %define minor_version 0
-%define micro_version 39
+%define micro_version 42
 
 %define packdname apache-tomcat-%{version}-src
 %define tcuid 91
@@ -98,6 +98,7 @@ BuildRequires:  jakarta-commons-dbcp
 BuildRequires:  jakarta-commons-pool
 BuildRequires:  jakarta-taglibs-standard >= 1.1
 BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  javapackages-tools
 BuildRequires:  jpackage-utils >= 1.7.0
 BuildRequires:  junit
 BuildRequires:  sed
@@ -641,7 +642,7 @@ fi
 %attr(0755,root,root) %{_initrddir}/%{name}
 %endif
 #bnc#565901
-%attr(0755,root,root) %{bindir}/catalina.sh
+%{bindir}/catalina.sh
 %if ! %{with_systemd}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %endif
@@ -649,7 +650,7 @@ fi
 # % config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 # bnc#726307
 %attr(0775,root,tomcat) %dir %{confdir}
-%attr(0775,root,tomcat) %dir %{confdir}/Catalina
+%{confdir}/Catalina
 # % attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
 %config(noreplace) %{confdir}/%{name}.conf
 %config(noreplace) %{confdir}/*.policy