Version 3.0.3-1.

1 files changed, 52 insertions, 58 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7bc24e6eccb8..578ba6e7c0a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,16 @@
 # Maintainer: Marcel Campello Ferreira <marcel.campello.ferreira@gmail.com>
 pkgname=neo4j-community
-pkgver=2.3.3
+pkgver=3.0.3
 pkgrel=1
-pkgdesc="A fully transactional graph database implemented in Java"
+pkgdesc='A fully transactional graph database implemented in Java'
 arch=(any)
-url="http://neo4j.org/"
-license=(GPL)
+url=http://neo4j.org/
+license=(custom)
 makedepends=(patch)
-depends=(bash lsof java-runtime-headless)
+depends=(bash 'java-runtime-headless>=8')
 conflicts=(neo4j-enterprise)
-backup=(etc/neo4j/neo4j-http-logging.xml
-        etc/neo4j/neo4j-server.properties
-        etc/neo4j/neo4j-wrapper.conf
-        etc/neo4j/neo4j.properties)
+backup=(etc/neo4j/neo4j-wrapper.conf
+        etc/neo4j/neo4j.conf)
 options=(!strip)
 install=neo4j.install
 source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz
@@ -21,76 +19,72 @@ source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz
         neo4j.install
         neo4j.service
         neo4j-tmpfile.conf)
-sha256sums=('01559c55055516a42ee2dd100137b6b55d63f02959a3c6c6db7a152e045828d9'
-            'a96f364ff3c3bf62e8a007364a87daef4a0515bce432a54899f5b97f0ff9c7d4'
-            '4717f8765d2a6912120077337402ac8dfa3a793ee723ea41080c3412457d78e0'
+sha256sums=('20cd65c84a6e5345f17bb03c145190f74e58ec2754c2e515a64b317e34dae2ce'
+            '0967d580b7847800b942138e685e80ba423ae3170ff1fc059f1cef0edd4ce5d8'
+            '7a8b8ddf3753be94562e8f5f9a9db021a1000548940a65009201924357a1581c'
             '3c4f3daea1623a5bc4c56d87ff4d76ff4737722eb730e2f9b65a0980bf3633a3'
-            'ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7'
-            'e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d')
+            'cf3148bd65ddc06f5ca8cf2ad37013d2e1aa561c5759e4b295f361465e603928'
+            'e1311352e05b1e698599b91883141b938ceb418abd7e6bc11cc964854f0a21e1')
 
 prepare() {
 
   cd $srcdir/neo4j-community-$pkgver
-
-  rm bin/neo4j-installer
-  rm -rf bin/Neo4j-Management
-  rm -rf system/resources
-
-  # Adjust configuration to match new directory structure
-  patch -Np1 -i ../conf.patch
   patch -Np1 -i ../bin.patch
+  patch -Np1 -i ../conf.patch
 }
 
 package() {
 
-  NEO4J_HOME=usr/share/java/neo4j
-  NEO4J_SHARE=usr/share/neo4j
-  NEO4J_CONFIG=etc/neo4j
-  NEO4J_INSTANCE=var/lib/neo4j
-  NEO4J_LOG=var/log/neo4j
-  NEO4J_RUNDIR=run/neo4j
-  NEO4J_PIDFILE=${NEO4J_RUNDIR}/neo4j-service.pid
-
   cd $srcdir/neo4j-community-$pkgver
 
   # Config files
-  install -dm755 $pkgdir/$NEO4J_CONFIG
-  cp -r conf/* $pkgdir/$NEO4J_CONFIG
+  CONFIG_DIR=etc/neo4j
+  install -dm755 $pkgdir/$CONFIG_DIR
+  [[ $(ls -A conf/* 2>/dev/null) ]] && cp -r conf/* $pkgdir/$CONFIG_DIR
 
-  # Copy JARs in lib, system and plugins
-  install -dm755 $pkgdir/$NEO4J_HOME
-  cp -r lib/* $pkgdir/$NEO4J_HOME
+  # Data, import and log files
+  DATA_DIR=var/lib/neo4j/data
+  install -dm755 $pkgdir/$DATA_DIR
+  [[ $(ls -A data/* 2>/dev/null) ]] && cp -r data/* $pkgdir/$DATA_DIR
 
-  install -dm755 $pkgdir/$NEO4J_HOME/system
-  cp -r system/* $pkgdir/$NEO4J_HOME/system
-  
-  install -dm755 $pkgdir/$NEO4J_HOME/plugins
-  cp -r plugins/* $pkgdir/$NEO4J_HOME/plugins
+  IMPORT_DIR=var/lib/neo4j/import
+  install -dm755 $pkgdir/$IMPORT_DIR
+  [[ $(ls -A import/* 2>/dev/null) ]] && cp -r import/* $pkgdir/$IMPORT_DIR
+
+  LOG_DIR=var/log/neo4j
+  install -dm755 $pkgdir/$LOG_DIR
+  [[ $(ls -A logs/* 2>/dev/null) ]] && cp -r logs/* $pkgdir/$LOG_DIR
+
+  # Copy JARs in lib and plugins
+  LIB_DIR=usr/share/java/neo4j
+  install -dm755 $pkgdir/$LIB_DIR
+  [[ $(ls -A lib/* 2>/dev/null) ]] && cp -r lib/* $pkgdir/$LIB_DIR
+
+  PLUGINS_DIR=usr/share/java/neo4j/plugins
+  install -dm755 $pkgdir/$PLUGINS_DIR
+  [[ $(ls -A plugins/* 2>/dev/null) ]] && cp -r plugins/* $pkgdir/$PLUGINS_DIR
 
   # Executable files
-  install -dm755 $pkgdir/$NEO4J_SHARE/bin
-  cp -r bin/* $pkgdir/$NEO4J_SHARE/bin
-
-  install -dm755 $pkgdir/usr/bin
-  ln -s /$NEO4J_SHARE/bin/neo4j $pkgdir/usr/bin/neo4j
-  ln -s /$NEO4J_SHARE/bin/neo4j-import $pkgdir/usr/bin/neo4j-import
-  ln -s /$NEO4J_SHARE/bin/neo4j-shell $pkgdir/usr/bin/neo4j-shell
-
-  # Data and log files
-  install -dm755 $pkgdir/$NEO4J_LOG
-  cp -r data/log/* $pkgdir/$NEO4J_LOG
-  
-  install -dm755 $pkgdir/$NEO4J_INSTANCE/data
-  rm -rf data/log
-  cp -r data/* $pkgdir/$NEO4J_INSTANCE/data
+  BIN_DIR=usr/share/neo4j/bin
+  install -dm755 $pkgdir/$BIN_DIR
+  [[ $(ls -A bin/* 2>/dev/null) ]] && cp -r bin/* $pkgdir/$BIN_DIR
+
+  SYSTEM_BIN_DIR=usr/bin
+  install -dm755 $pkgdir/$SYSTEM_BIN_DIR
+  for file in $(find $pkgdir/$BIN_DIR -maxdepth 1 -type f); do
+    b_file=$(basename $file)
+    ln -s /$BIN_DIR/$b_file $pkgdir/$SYSTEM_BIN_DIR/$b_file;
+  done
 
   # Documentation
-  install -dm755 $pkgdir/usr/share/doc/neo4j
-  cp CHANGES.txt README.txt UPGRADE.txt $pkgdir/usr/share/doc/neo4j
+  DOC_DIR=usr/share/doc/neo4j
+  install -dm755 $pkgdir/$DOC_DIR
+  cp README.txt UPGRADE.txt $pkgdir/$DOC_DIR
 
   # License files
-  install -dm755 $pkgdir/usr/share/licenses/neo4j
-  cp LICENSE.txt LICENSES.txt NOTICE.txt $pkgdir/usr/share/licenses/neo4j
+  LICENSES_DIR=usr/share/licenses/neo4j
+  install -dm755 $pkgdir/$LICENSES_DIR
+  cp LICENSE.txt LICENSES.txt NOTICE.txt $pkgdir/$LICENSES_DIR
 
   # Service definition files
   cd $srcdir