ap/omero: Upgraded to omero-4.2.0.

ap/omero/omero-Beta4.1.1.tar.bz2.sha1

@@ -1 +0,0 @@
-699f03a6c45f4ab2ea3bbd1ab476fd8631f6bfc6  omero-Beta4.1.1.tar.bz2

ap/omero/omero-Beta4.2.0.tar.bz2.sha1

@@ -0,0 +1 @@
+567bcafbfdb67e5bbfbb0fbf099423a7119b6da8  omero-Beta4.2.0.tar.bz2

ap/omero/omero.SlackBuild

@@ -29,14 +29,14 @@
 
 # Source package infos
 NAMESRC=${NAMESRC:-omero}
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-4.2.0}
 ARCHIVE=${ARCHIVE:-$NAMESRC-Beta$VERSION.tar.bz2}
 WGET=${WGET:-http://cvs.openmicroscopy.org.uk/snapshots/omero/$ARCHIVE}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-omero}
 BUILD=${BUILD:-1GGD}
-ARCH=${ARCH:-i486}
+ARCH=${ARCH:-$(uname -m | sed 's/^i?86$/i486/;s/^arm.*/arm/')}
 JOBS=${JOBS:-1}
 EXT=${EXT:-txz}
 
@@ -69,7 +69,7 @@ sha1sum -c $ARCHIVE.sha1
 mkdir -p $PKG/opt
 cd $PKG/opt
 tar xf $CWD/$ARCHIVE
-mv omero_dist omero
+mv OMERO.server-Beta-4.2.0 omero
 
 # Fix superfluous 'BEGIN' SQL instruction
 # that cause a lot of logging overhead in PostgreSQL
@@ -91,7 +91,7 @@ mv omero/etc $PKG/etc/omero
 ln -s /etc/omero $PKG/opt/omero/etc
 (
   cd $PKG/etc/omero
-  rm -rf Windows* local.properties.example grid/windefault.xml
+  rm -rf Windows* local.properties.example grid/windefault.xml nginx.conf.template
   for f in backup.cfg hibernate.properties ice.config internal.cfg ivysettings.xml log4j-indexing.xml log4j.xml master.cfg node?.cfg omero.properties rollover.cfg testdropbox.config grid/*.xml ; do
       mv $f $f.new
   done

ap/omero/rc.omero

@@ -40,8 +40,8 @@ omero_initialize()
         (
           cd /opt/omero
           sudo -H -u omero omero db script
-          psql -h $DB_HOST -p $DB_PORT -U $DB_USER $DB_NAME < OMERO4.1__0.sql
-          rm -rf OMERO4.1__0.sql
+          psql -h $DB_HOST -p $DB_PORT -U $DB_USER $DB_NAME < OMERO4.2__0.sql
+          rm -rf OMERO4.2__0.sql
         )
     fi
 }
@@ -57,8 +57,10 @@ start)
     ;;
 
 stop)
-    sudo -H -u omero omero admin stop
-    [ -f $ICEGRID_PIDFILE ] && kill -TERM $(< $ICEGRID_PIDFILE)
+    if [ -f $ICEGRID_PIDFILE ] && kill -0 $(< $ICEGRID_PIDFILE) 2>/dev/null ; then
+        sudo -H -u omero omero admin stop
+        kill -TERM $(< $ICEGRID_PIDFILE)
+    fi
     ;;
 
 restart)