Upstream release 1.0.0

4 files changed, 30 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14c5914c6c37..97ab8312c15e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = storm
 	pkgdesc = Distributed and fault-tolerant realtime computation system
-	pkgver = 0.10.0
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = https://storm.apache.org/
 	install = install_storm.sh
@@ -13,7 +13,7 @@ pkgbase = storm
 	backup = etc/storm/storm.yaml
 	backup = etc/zookeeper/zookeeper-storm/zoo.cfg
 	backup = etc/zookeeper/zookeeper-storm/log4j.properties
-	source = http://apache.crihan.fr/dist///storm/apache-storm-0.10.0/apache-storm-0.10.0.tar.gz
+	source = http://apache.mirrors.ovh.net/ftp.apache.org/dist///storm/apache-storm-1.0.0/apache-storm-1.0.0.tar.gz
 	source = zookeeper_zoo.cfg
 	source = zookeeper_log4j.properties
 	source = systemd_storm-nimbus.service
@@ -21,7 +21,8 @@ pkgbase = storm
 	source = systemd_storm-ui.service
 	source = systemd_sysusers.d_storm.conf
 	source = systemd_tmpfiles.d_storm.conf
-	sha256sums = 066d1f5343333efd9187d7b850047cf9b3f63d885811e9fdd6e50f949b432f62
+	source = arch_python2.patch
+	sha256sums = 8233dab1a6898fc39bcf9fe68dfadbee38159a39c473ac2da9ce9da60db52066
 	sha256sums = c94799f4b459f5218faf1da57936baeb4c32b9542a1ba0aacdd637bf2f3aaf05
 	sha256sums = 00780ee4cea3bb7a282a548f41b8964d5e392776f9d687ebea89cd49ed5742e3
 	sha256sums = 0d8958786538714da86ccf3f23cb668fa017530f8858aea2b7325ffe1af66cd1
@@ -29,6 +30,7 @@ pkgbase = storm
 	sha256sums = 41eade47c4e3b07c53c84351730b1f8752341eed095b6b6fc499ccc2213bead3
 	sha256sums = 66db40103bc75bae0817581ef1bbde35bb3b81c2494eda5a8c769813ddd000f1
 	sha256sums = 15c959356f32c9583fe6a328d2ec4c7addb983ac7a2529621d90c24b49a07df3
+	sha256sums = 94567fe94f4d27b1a82714231c0fa9a87827343f3838f9a962e3483f6c6d26a5
 
 pkgname = storm
 
diff --git a/PKGBUILD b/PKGBUILD
index 00a59bd4a1b9..cf7ed9b892d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # TODO split packages? nimbus/supervisor/ui ?
 
 pkgname=storm
-pkgver=0.10.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc='Distributed and fault-tolerant realtime computation system'
 arch=('any')
@@ -32,16 +32,18 @@ source=(${_closest}/${_app_path}
         systemd_storm-supervisor.service
         systemd_storm-ui.service
         systemd_sysusers.d_storm.conf
-        systemd_tmpfiles.d_storm.conf)
+        systemd_tmpfiles.d_storm.conf
+        arch_python2.patch)
 
-sha256sums=('066d1f5343333efd9187d7b850047cf9b3f63d885811e9fdd6e50f949b432f62'
+sha256sums=('8233dab1a6898fc39bcf9fe68dfadbee38159a39c473ac2da9ce9da60db52066'
             'c94799f4b459f5218faf1da57936baeb4c32b9542a1ba0aacdd637bf2f3aaf05'
             '00780ee4cea3bb7a282a548f41b8964d5e392776f9d687ebea89cd49ed5742e3'
             '0d8958786538714da86ccf3f23cb668fa017530f8858aea2b7325ffe1af66cd1'
             '894b41bd473410271337585509fe9db431a74f3ae2114039229a5742214e097e'
             '41eade47c4e3b07c53c84351730b1f8752341eed095b6b6fc499ccc2213bead3'
             '66db40103bc75bae0817581ef1bbde35bb3b81c2494eda5a8c769813ddd000f1'
-            '15c959356f32c9583fe6a328d2ec4c7addb983ac7a2529621d90c24b49a07df3')
+            '15c959356f32c9583fe6a328d2ec4c7addb983ac7a2529621d90c24b49a07df3'
+            '94567fe94f4d27b1a82714231c0fa9a87827343f3838f9a962e3483f6c6d26a5')
 
 package() {
   cd "${srcdir}/apache-${pkgname}-${pkgver}"
@@ -62,6 +64,8 @@ package() {
   sed -i "1s|^#!/usr/bin/python$|#!/usr/bin/python2|" \
     "${pkgdir}${_app_home}/bin/storm.py"
   ln -s ${_app_home}/bin/storm "${pkgdir}/usr/bin/storm"
+  patch -d "${pkgdir}${_app_home}" \
+        -p0 < "${srcdir}/arch_python2.patch"
 
   cp -r lib/* "${pkgdir}/usr/share/java/${pkgname}"
   ln -s ../java/${pkgname} "${pkgdir}${_app_home}/lib"
diff --git a/arch_python2.patch b/arch_python2.patch
new file mode 100644
index 000000000000..2ab8eecb60e0
--- /dev/null
+++ b/arch_python2.patch
@@ -0,0 +1,13 @@
+--- bin/storm.orig	2016-04-17 14:26:51.369652776 +0200
++++ bin/storm	2016-04-17 14:27:08.493227056 +0200
+@@ -31,8 +31,8 @@
+ done
+ 
+ # find python >= 2.6
+-if [ -a /usr/bin/python2.6 ]; then
+-  PYTHON=/usr/bin/python2.6
++if [ -a /usr/bin/python2 ]; then
++  PYTHON=/usr/bin/python2
+ fi
+ 
+ if [ -z "$PYTHON" ]; then
diff --git a/install_storm.sh b/install_storm.sh
index 2b357fe4bd58..a63a2ea91d06 100644
--- a/install_storm.sh
+++ b/install_storm.sh
@@ -6,6 +6,10 @@ post_install() {
 post_upgrade(){
     systemd-sysusers storm.conf
     systemd-tmpfiles --create storm.conf
+
+    echo "Moving to Storm 1.0 is not a rolling upgrade."
+    echo "Have a look at the following JIRA report for migration hints:"
+    echo "  https://issues.apache.org/jira/browse/STORM-1710"
 }
 
 post_remove() {