Update to v5.7.1. Use git repository now instead of release tarball.

3 files changed, 17 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37029c457418..96715f712211 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,23 @@
 pkgbase = ecal
 	pkgdesc = enhanced Communication Abstraction Layer
-	pkgver = 5.6.0
-	pkgrel = 2
+	pkgver = 5.7.1
+	pkgrel = 1
 	url = https://github.com/continental/ecal
 	arch = x86_64
 	arch = armv7h
 	license = Apache
-	makedepends = asio
 	makedepends = cmake
 	makedepends = doxygen
-	makedepends = fineftp-server
 	makedepends = git
 	makedepends = graphviz
-	makedepends = gtest
-	makedepends = simpleini
-	makedepends = spdlog
-	makedepends = tclap
-	makedepends = tinyxml2
 	depends = curl
 	depends = protobuf
 	depends = qt5-base
 	depends = hdf5
 	backup = etc/ecal/ecal.ini
 	backup = etc/ecal/ecaltime.ini
-	source = https://github.com/continental/ecal/archive/v5.6.0.tar.gz
-	source = arch-linux-compat.diff
-	sha256sums = 9f36eaf456a5840e2417561842a0161d55b85511f47eb1848b2aad969eb8eb92
-	sha256sums = 44a534b6c2b1bbc615a1f878c569d44c4919f0085df496224286921dc877ce28
+	source = git+https://github.com/continental/ecal.git
+	sha256sums = SKIP
 
 pkgname = ecal
 
diff --git a/PKGBUILD b/PKGBUILD
index 8b8832d5c1e3..38f60e834e49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,41 @@
 # Maintainer: Tobias Borgert <tobias.borgert@gmail.com>
 
 pkgname=ecal
-_pkgver_major=5
-_pkgver_minor=6
-_pkgver_patch=0
-pkgver=$_pkgver_major.$_pkgver_minor.$_pkgver_patch
-pkgrel=2
+pkgver=5.7.1
+pkgrel=1
 pkgdesc="enhanced Communication Abstraction Layer"
 arch=('x86_64' 'armv7h')
 url="https://github.com/continental/ecal"
 license=('Apache')
 depends=('curl' 'protobuf' 'qt5-base' 'hdf5')
-makedepends=('asio' 'cmake' 'doxygen'  'fineftp-server' 'git' 'graphviz' 'gtest' 'simpleini' 'spdlog' 'tclap' 'tinyxml2')
+makedepends=('cmake' 'doxygen' 'git' 'graphviz')
 optdepends=()
-source=(https://github.com/continental/ecal/archive/v$pkgver.tar.gz
-        arch-linux-compat.diff)
-sha256sums=('9f36eaf456a5840e2417561842a0161d55b85511f47eb1848b2aad969eb8eb92'
-            '44a534b6c2b1bbc615a1f878c569d44c4919f0085df496224286921dc877ce28')
+source=(git+https://github.com/continental/ecal.git)
+sha256sums=('SKIP')
 backup=('etc/ecal/ecal.ini' 'etc/ecal/ecaltime.ini')
 
 prepare() {
-    cd $pkgname-$pkgver
-    patch --forward --strip=1 --input="../arch-linux-compat.diff"
+    cd $pkgname
+    git checkout v${pkgver}
+    git submodule init
+    git submodule update
 }
 
 build() {
-	cd $pkgname-$pkgver
-	sed -i /set\(eCAL_VERSION_MAJOR\ /s/\$\{GIT_REVISION_MAJOR\}/"$_pkgver_major"/g CMakeLists.txt
-	sed -i /set\(eCAL_VERSION_MINOR\ /s/\$\{GIT_REVISION_MINOR\}/"$_pkgver_minor"/g CMakeLists.txt
-	sed -i /set\(eCAL_VERSION_PATCH\ /s/\$\{GIT_REVISION_PATCH\}/"$_pkgver_patch"/g CMakeLists.txt
+	cd $pkgname
 	mkdir -p _build
 	cd _build
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
 		 -DCMAKE_BUILD_TYPE=Release \
 		 -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \
-		 -DECAL_THIRDPARTY_BUILD_SPDLOG=OFF \
-		 -DECAL_THIRDPARTY_BUILD_TINYXML2=OFF \
-		 -DECAL_THIRDPARTY_BUILD_FINEFTP=OFF \
 		 -DECAL_THIRDPARTY_BUILD_CURL=OFF \
-		 -DECAL_THIRDPARTY_BUILD_GTEST=OFF \
-		 -DECAL_THIRDPARTY_BUILD_HDF5=OFF
+		 -DECAL_THIRDPARTY_BUILD_HDF5=OFF \
+                 -DCMAKE_INSTALL_SYSCONFDIR=/etc
 	make
 }
 
 package() {
-	cd $pkgname-$pkgver
+	cd $pkgname
 	cd _build
 	DESTDIR="$pkgdir" make install
-        mv "$pkgdir/usr/etc" "$pkgdir/etc"	
 }
diff --git a/arch-linux-compat.diff b/arch-linux-compat.diff
deleted file mode 100644
index f4d341922e11..000000000000
--- a/arch-linux-compat.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/app/rec/rec_server_core/CMakeLists.txt b/app/rec/rec_server_core/CMakeLists.txt
-index bc280d2..22f3e1a 100644
---- a/app/rec/rec_server_core/CMakeLists.txt
-+++ b/app/rec/rec_server_core/CMakeLists.txt
-@@ -18,6 +18,7 @@
- 
- find_package(Threads REQUIRED)
- find_package(Protobuf REQUIRED)
-+find_package(asio REQUIRED)
- find_package(spdlog REQUIRED)
- find_package(fineftp REQUIRED)
- find_package(tinyxml2 REQUIRED)