From f4f0187f69f1c8e175c542fea558457a2f09585af1d8551d2f353d97cc8e049e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 17 Feb 2016 18:24:24 +0000
Subject: [PATCH 1/3] - Version update to 8.0.32:   * Another bugfix release
 for 8.0 series, full details:    
 http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.32_(markt)
 - Rebase patch:   * tomcat-8.0.9-property-build.windows.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=77
---
 apache-tomcat-8.0.32-src.tar.gz           |  3 +++
 apache-tomcat-8.0.32-src.tar.gz.asc       | 17 +++++++++++++
 tomcat-8.0.9-property-build.windows.patch | 27 ++++++++++++--------
 tomcat.changes                            |  9 +++++++
 tomcat.spec                               | 31 ++++++++++++-----------
 5 files changed, 61 insertions(+), 26 deletions(-)
 create mode 100644 apache-tomcat-8.0.32-src.tar.gz
 create mode 100644 apache-tomcat-8.0.32-src.tar.gz.asc

diff --git a/apache-tomcat-8.0.32-src.tar.gz b/apache-tomcat-8.0.32-src.tar.gz
new file mode 100644
index 0000000..760771b
--- /dev/null
+++ b/apache-tomcat-8.0.32-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560
+size 4957920
diff --git a/apache-tomcat-8.0.32-src.tar.gz.asc b/apache-tomcat-8.0.32-src.tar.gz.asc
new file mode 100644
index 0000000..24e6764
--- /dev/null
+++ b/apache-tomcat-8.0.32-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWsQbNAAoJEBDAHFovYFnnZRoP/1kS4JhRn1QLHI00h1VKRITF
+18xGGlXKBYJTYlynhEULxlFk5xV4ExSsaZFz3wHoMpKH5UwwBuwv9FF6sbdwuRhN
+xBkVhM5LhV0/eL1Qk7OqyrbWms3FmzC0mq9MTweHM1HCCeZ8/n6Aiz+ykGD/U22i
+7fX3tQVZLC9QFVmpLFWjT4BkAV+5eUqJWSbKCP8jiQ5t76zRzG31tjpF8sPsXZ53
+FfIDpC5Sho1Mk2/Ak10QMtN0ArQ2Y64mpZvi4Lqh5+b24tA2HT8VdAuhke3hmgll
+wozMy8ci7atuAg2vcYq6VXj0dnUgf1GTUU28YoQbkVHegCPXy/VMnL6O38ednF/X
+ZiL0Gbk5sCVPnPMb6UN3IEKP+ukG3tucpDQY/MMXkb5I3WyBQvc/Kwx0nG8aOmUY
+DzeGtSKQhW+08GsHMeoc9eYHukedWWxL8O2x6ozgSKNhyjq84rJI0ndgk0niemVu
+mLofmzbIrnnUY+R6dDoR2TqUyZVmkw1uFE7Pb165kSuJJauP5kRGrKOCNfbsjl1H
+OHK7+2PZ1SrrEAWEAAg5LmEtbkq9HJeInKEjDXaW9ASS5VqZpOIPo4JgjBv3NR2J
+xdDmCa0Zy7nVPtwOsi8s02fJCP0BBFh8hb4hcdkG+aR9UYsCdfx2L+mxwusdS8dI
+5Mkeg1+WUp9XnYkCu+8G
+=M/JH
+-----END PGP SIGNATURE-----
diff --git a/tomcat-8.0.9-property-build.windows.patch b/tomcat-8.0.9-property-build.windows.patch
index fb27704..34741c3 100644
--- a/tomcat-8.0.9-property-build.windows.patch
+++ b/tomcat-8.0.9-property-build.windows.patch
@@ -1,17 +1,22 @@
-diff -Naur apache-tomcat-8.0.9-src.orig/build.properties.default apache-tomcat-8.0.9-src/build.properties.default
---- apache-tomcat-8.0.9-src.orig/build.properties.default	2014-07-10 00:40:22.307077465 +0200
-+++ apache-tomcat-8.0.9-src/build.properties.default	2014-07-10 00:46:11.686385324 +0200
-@@ -230,3 +230,6 @@
- 
- # ----- JVM settings for unit tests
+Index: apache-tomcat-8.0.32-src/build.properties.default
+===================================================================
+--- apache-tomcat-8.0.32-src.orig/build.properties.default
++++ apache-tomcat-8.0.32-src/build.properties.default
+@@ -58,6 +58,9 @@ execute.findbugs=false
+ # multicast tests to work
  java.net.preferIPv4Stack=false
-+
+ 
 +# ----- Build on Windows ----
 +build.windows=false
-diff -Naur apache-tomcat-8.0.9-src.orig/build.xml apache-tomcat-8.0.9-src/build.xml
---- apache-tomcat-8.0.9-src.orig/build.xml	2014-07-10 00:40:22.231077516 +0200
-+++ apache-tomcat-8.0.9-src/build.xml	2014-07-10 00:41:08.473037957 +0200
-@@ -2706,7 +2706,7 @@
++
+ # Location of GPG executable (used only for releases)
+ gpg.exec=/path/to/gpg
+ 
+Index: apache-tomcat-8.0.32-src/build.xml
+===================================================================
+--- apache-tomcat-8.0.32-src.orig/build.xml
++++ apache-tomcat-8.0.32-src/build.xml
+@@ -2844,7 +2844,7 @@ skip.installer property in build.propert
    </target>
  
    <target name="download-dist"
diff --git a/tomcat.changes b/tomcat.changes
index 08beeaa..049928f 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 17 18:12:57 UTC 2016 - tchvatal@suse.com
+
+- Version update to 8.0.32:
+  * Another bugfix release for 8.0 series, full details:
+    http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.32_(markt)
+- Rebase patch:
+  * tomcat-8.0.9-property-build.windows.patch
+
 -------------------------------------------------------------------
 Tue Nov 10 09:20:40 UTC 2015 - dmacvicar@suse.de
 
diff --git a/tomcat.spec b/tomcat.spec
index 6f966b7..780b39f 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,6 +23,7 @@
 %define elspec 3.0
 %define major_version 8
 %define minor_version 0
+%define micro_version 32
 %define micro_version 28
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -155,8 +156,8 @@ The documentation of web application for Apache Tomcat.
 %package el-3_0-api
 Summary:        Expression Language v3.0 API
 Group:          Development/Libraries/Java
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 Provides:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Provides:       el_3_0_api = %{version}-%{release}
 Provides:       el_api = %{elspec}
@@ -176,8 +177,8 @@ Javadoc generated documentation files for Apache Tomcat.
 Summary:        Apache Tomcat JSP API implementation classes
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 Provides:       %{name}-jsp-%{jspspec}-api
 Provides:       jsp = %{jspspec}
 Provides:       jsp23
@@ -217,8 +218,8 @@ Libraries required to successfully run the Tomcat Web container
 %package servlet-3_1-api
 Summary:        Apache Tomcat Servlet API implementation classes
 Group:          Productivity/Networking/Web/Servers
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 Provides:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
 Provides:       servlet = %{servletspec}
 Provides:       servlet31
@@ -627,32 +628,32 @@ ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.j
 %endif
 
 %post el-3_0-api
-%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
-%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
+update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
+update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
 
 %preun el-3_0-api
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
-    %{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+    update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+    update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
 fi
 
 %post jsp-2_3-api
-%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
+update-alternatives --install %{_javadir}/jsp.jar jsp \
     %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
 
 %postun jsp-2_3-api
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove jsp \
+    update-alternatives --remove jsp \
         %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 fi
 
 %post servlet-3_1-api
-%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
+update-alternatives --install %{_javadir}/servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
 
 %postun servlet-3_1-api
 if [ $1 -eq 0 ] ; then
-    %{_sbindir}/update-alternatives --remove servlet \
+    update-alternatives --remove servlet \
         %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 fi
 

From c62573efde6f780bf2a5cd8b076b443ec171014ded0f55fa2485cd0b1b482e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 17 Feb 2016 18:34:13 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=78

---
 tomcat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tomcat.spec b/tomcat.spec
index 780b39f..7ac7928 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -24,7 +24,6 @@
 %define major_version 8
 %define minor_version 0
 %define micro_version 32
-%define micro_version 28
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %define appdir /srv/%{name}/webapps

From 8150173a3180eae4effa61114417153c07cdee1f634eea1824220a67d962e93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 17 Feb 2016 19:25:27 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=79

---
 apache-tomcat-8.0.28-src.tar.gz     |  3 ---
 apache-tomcat-8.0.28-src.tar.gz.asc | 17 -----------------
 2 files changed, 20 deletions(-)
 delete mode 100644 apache-tomcat-8.0.28-src.tar.gz
 delete mode 100644 apache-tomcat-8.0.28-src.tar.gz.asc

diff --git a/apache-tomcat-8.0.28-src.tar.gz b/apache-tomcat-8.0.28-src.tar.gz
deleted file mode 100644
index 94304ee..0000000
--- a/apache-tomcat-8.0.28-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367
-size 4913153
diff --git a/apache-tomcat-8.0.28-src.tar.gz.asc b/apache-tomcat-8.0.28-src.tar.gz.asc
deleted file mode 100644
index cc78478..0000000
--- a/apache-tomcat-8.0.28-src.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJWFWTzAAoJEBDAHFovYFnnfhMQANrju2xs8MUmER/wHaq/PbFw
-uNYOuvdZ4451+TeOYHQURw2+o06coWsRWQcbzYh2QBr3wByF2oADQmO0Gp7xFdGJ
-eGBPKtvXFKIye9vctEWXFF25KeqaS0AhLvcqDdzRzJIe+x0W5oZYV+9/KYCTrEVZ
-Ny0GqXcnd08XjmylC2NDap7rPjiEdAdx+XMqh4oIkY9buA1cDJGAJZRQU7bheWOp
-hY4YKTwQd8l1pgbAouLpo3ZIzhplD7P59U0IW03HtAShPKPdDZxF3RKFfxOFJrFF
-V0t057451oBnElodK7/3OorpkfbsBrn9drUoMGIZFwWLpNrVfmm6sdpjkqL1/wXp
-s3z7cV2Ef4jBxC/0BNG95FmKOsY+xM9rvk4iiKO27RL5TFL+7yqy1e7XAamp6D5/
-UWnoXBX2QD0/4rduyflUb/4vEKUxj8ful1H/ikI2Ok/2Hi0jf07jpZ7i5X4uZjf3
-Fv8gWOCOhRpAYJds3GtPCz82PXJeiIZxhV/yThaKC2eSCLZzt99Yft0v24IojFOH
-2vueih4ekHBbqihIc1jtipbztK6Llyap5jHiYAxx6LvQaNIFn2kvk/hKQzkC8oVc
-4msgqDdLzv2dbwdRthf3a8guDyoEp0CBBwlAd8UAxt17IHbI+ZcEoT6xLUYtaNWE
-7QPDpjTJ/Iw8fUiA7TdA
-=feOp
------END PGP SIGNATURE-----