fork to support beta builds

2 files changed, 40 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffa3ef0ada82..19a53a0056aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = storm
+pkgbase = storm-beta
 	pkgdesc = Distributed and fault-tolerant realtime computation system
-	pkgver = 0.9.5
+	pkgver = 0.10.0beta1
 	pkgrel = 1
 	url = https://storm.apache.org/
 	install = install_storm.sh
@@ -9,11 +9,13 @@ pkgbase = storm
 	depends = java-runtime
 	depends = python2
 	depends = zookeeper
+	conflicts = storm
+	replaces = storm
 	backup = etc/storm/storm_env.ini
 	backup = etc/storm/storm.yaml
 	backup = etc/zookeeper/zookeeper-storm/zoo.cfg
 	backup = etc/zookeeper/zookeeper-storm/log4j.properties
-	source = http://www.webhostingjams.com/mirror/apache///storm/apache-storm-0.9.5/apache-storm-0.9.5.tar.gz
+	source = http://apache.mivzakim.net///storm/apache-storm-0.10.0-beta1/apache-storm-0.10.0-beta1.tar.gz
 	source = zookeeper_zoo.cfg
 	source = zookeeper_log4j.properties
 	source = systemd_storm-nimbus.service
@@ -21,7 +23,7 @@ pkgbase = storm
 	source = systemd_storm-ui.service
 	source = systemd_sysusers.d_storm.conf
 	source = systemd_tmpfiles.d_storm.conf
-	sha256sums = 2e8337126de8d1e180abe77fb81af7c971f8c4b2dad94e446ac86c0f02ba3fb2
+	sha256sums = e54b400b1e1a012149e74602e2441b355c433f27773e7191172342c8b595467d
 	sha256sums = c94799f4b459f5218faf1da57936baeb4c32b9542a1ba0aacdd637bf2f3aaf05
 	sha256sums = 00780ee4cea3bb7a282a548f41b8964d5e392776f9d687ebea89cd49ed5742e3
 	sha256sums = 0d8958786538714da86ccf3f23cb668fa017530f8858aea2b7325ffe1af66cd1
@@ -30,5 +32,5 @@ pkgbase = storm
 	sha256sums = 66db40103bc75bae0817581ef1bbde35bb3b81c2494eda5a8c769813ddd000f1
 	sha256sums = 15c959356f32c9583fe6a328d2ec4c7addb983ac7a2529621d90c24b49a07df3
 
-pkgname = storm
+pkgname = storm-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 01340ace8a6d..53fbeda0e21a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,19 @@
 # TODO change zoo ports
 # TODO split packages? nimbus/supervisor/ui ?
 
-pkgname=storm
-pkgver=0.9.5
+pkgname=storm-beta
+_version=0.10.0
+_snapshot=beta1
+_pkgver=${_version}-${_snapshot}
+pkgver=${_version}${_snapshot}
 pkgrel=1
 pkgdesc='Distributed and fault-tolerant realtime computation system'
 arch=('any')
 url='https://storm.apache.org/'
 license=('Apache')
 depends=('java-runtime' 'python2' 'zookeeper')
+conflicts=('storm')
+replaces=('storm')
 backup=(etc/storm/storm_env.ini
         etc/storm/storm.yaml
         etc/zookeeper/zookeeper-storm/zoo.cfg
@@ -24,7 +29,7 @@ install=install_storm.sh
 
 _apache_cgi="http://www.apache.org/dyn/closer.cgi"
 _closest=$(curl "${_apache_cgi}?asjson=1" | tr -d '\n ' | sed -r 's/.*"preferred":"(.+)".*/\1/')
-_app_path="/${pkgname}/apache-${pkgname}-${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"
+_app_path="/storm/apache-storm-${_pkgver}/apache-storm-${_pkgver}.tar.gz"
 source=(${_closest}/${_app_path}
         zookeeper_zoo.cfg
         zookeeper_log4j.properties
@@ -34,7 +39,7 @@ source=(${_closest}/${_app_path}
         systemd_sysusers.d_storm.conf
         systemd_tmpfiles.d_storm.conf)
 
-sha256sums=('2e8337126de8d1e180abe77fb81af7c971f8c4b2dad94e446ac86c0f02ba3fb2'
+sha256sums=('e54b400b1e1a012149e74602e2441b355c433f27773e7191172342c8b595467d'
             'c94799f4b459f5218faf1da57936baeb4c32b9542a1ba0aacdd637bf2f3aaf05'
             '00780ee4cea3bb7a282a548f41b8964d5e392776f9d687ebea89cd49ed5742e3'
             '0d8958786538714da86ccf3f23cb668fa017530f8858aea2b7325ffe1af66cd1'
@@ -44,47 +49,49 @@ sha256sums=('2e8337126de8d1e180abe77fb81af7c971f8c4b2dad94e446ac86c0f02ba3fb2'
             '15c959356f32c9583fe6a328d2ec4c7addb983ac7a2529621d90c24b49a07df3')
 
 package() {
-  cd "${srcdir}/apache-${pkgname}-${pkgver}"
+  cd "${srcdir}/apache-storm-${_pkgver}"
 
-  _app_home=/usr/share/${pkgname}
+  _app_home=/usr/share/storm
 
-  install -d "${pkgdir}"{${_app_home}/bin,/etc,/usr/bin,/usr/share/java/${pkgname}}
-  install -d "${pkgdir}"/etc/zookeeper/zookeeper-${pkgname}
+  install -d "${pkgdir}"{${_app_home}/bin,/etc,/usr/bin,/usr/share/java/storm}
+  install -d "${pkgdir}"/etc/zookeeper/zookeeper-storm
 
-  cp -r conf "${pkgdir}/etc/${pkgname}/"
-  ln -s /etc/${pkgname} "${pkgdir}${_app_home}/conf"
+  cp -r conf "${pkgdir}/etc/storm/"
+  ln -s /etc/storm "${pkgdir}${_app_home}/conf"
   install -D -m 644 ${srcdir}/zookeeper_log4j.properties \
-    "${pkgdir}/etc/zookeeper/zookeeper-${pkgname}/log4j.properties"
+    "${pkgdir}/etc/zookeeper/zookeeper-storm/log4j.properties"
   install -D -m 644 ${srcdir}/zookeeper_zoo.cfg \
-    "${pkgdir}/etc/zookeeper/zookeeper-${pkgname}/zoo.cfg"
+    "${pkgdir}/etc/zookeeper/zookeeper-storm/zoo.cfg"
 
   cp -r bin/storm "${pkgdir}${_app_home}/bin/"
+  cp -r bin/storm.py "${pkgdir}${_app_home}/bin/"
+
   sed -i "1s|^#!/usr/bin/python$|#!/usr/bin/python2|" \
     "${pkgdir}${_app_home}/bin/storm"
   ln -s ${_app_home}/bin/storm "${pkgdir}/usr/bin/storm"
 
-  cp -r lib/* "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s ../java/${pkgname} "${pkgdir}${_app_home}/lib"
+  cp -r lib/* "${pkgdir}/usr/share/java/storm"
+  ln -s ../java/storm "${pkgdir}${_app_home}/lib"
 
-  cp -r examples external logback public RELEASE "${pkgdir}${_app_home}"
+  cp -r examples external public "${pkgdir}${_app_home}"
 
-  ln -s /var/log/${pkgname} "${pkgdir}${_app_home}/logs"
+  ln -s /var/log/storm "${pkgdir}${_app_home}/logs"
 
-  install -m 644 "${pkgdir}/etc/${pkgname}/storm.yaml" \
-    "${pkgdir}/etc/${pkgname}/storm.yaml.sample"
-  echo "dev.zookeeper.path: \"/var/lib/zookeeper/zookeeper-${pkgname}\"" \
-    >> "${pkgdir}/etc/${pkgname}/storm.yaml"
-  echo "storm.local.dir: \"/var/lib/${pkgname}\"" \
-    >> "${pkgdir}/etc/${pkgname}/storm.yaml"
+  install -m 644 "${pkgdir}/etc/storm/storm.yaml" \
+    "${pkgdir}/etc/storm/storm.yaml.sample"
+  echo "dev.zookeeper.path: \"/var/lib/zookeeper/zookeeper-storm\"" \
+    >> "${pkgdir}/etc/storm/storm.yaml"
+  echo "storm.local.dir: \"/var/lib/storm\"" \
+    >> "${pkgdir}/etc/storm/storm.yaml"
   #TODO dev-storm-zookeeper (add this in conjunction with special storm-zookeeper.service file?)
 
   install -D -m 644 ${srcdir}/systemd_sysusers.d_storm.conf \
-    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+    "${pkgdir}/usr/lib/sysusers.d/storm.conf"
   install -D -m 644 ${srcdir}/systemd_tmpfiles.d_storm.conf \
-    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    "${pkgdir}/usr/lib/tmpfiles.d/storm.conf"
 
   for s in nimbus supervisor ui; do
-    install -D -m 644 "${srcdir}/systemd_${pkgname}-${s}.service" \
-      "${pkgdir}/usr/lib/systemd/system/${pkgname}-${s}.service"
+    install -D -m 644 "${srcdir}/systemd_storm-${s}.service" \
+      "${pkgdir}/usr/lib/systemd/system/storm-${s}.service"
   done
 }