bump version to 0.8.0

3 files changed, 49 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87a5e29d5e52..45d944ce1317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = emercoin-bin
 	pkgdesc = Emercoin is a digital currency and blockchain service platform.
-	pkgver = 0.7.12
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = http://emercoin.com/
 	install = emercoin.install
@@ -15,12 +15,12 @@ pkgbase = emercoin-bin
 	depends = protobuf
 	provides = emercoin
 	conflicts = emercoin
-	source_x86_64 = https://github.com/emercoin/emercoin/releases/download/v0.7.12emc/emercoin-0.7.12-x86_64-linux-gnu.tar.xz
+	source_x86_64 = https://github.com/emercoin/emercoin/releases/download/v0.8.0emc/emercoin-0.8.0-x86_64-linux-gnu.tar.xz
 	source_x86_64 = emercoin.install
 	source_x86_64 = emercoind.service
 	source_x86_64 = emc48.png
 	source_x86_64 = com.emercoin.Emercoin.desktop
-	sha256sums_x86_64 = 59d06b9cb647db790ddaad4b0d1457af6b3ef806cd7c8cf8bbbcdb29e586d1b3
+	sha256sums_x86_64 = 9abe9f60f1674f19a31509d8ec0ab63b78d9c6ded9c017fad061e8edda0e9299
 	sha256sums_x86_64 = 9d430f8bc61ce2f7c4e1f4b297065b5b6adad92d7dd4088e9a3bb7ba7751feff
 	sha256sums_x86_64 = 9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed
 	sha256sums_x86_64 = 99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132
diff --git a/PKGBUILD b/PKGBUILD
index 87a1656723a0..a811a7a8a762 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,7 @@
 pkgname=emercoin-bin
-pkgver=0.7.12
+_pkgname=emercoin
+_githuborg=emercoin
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Emercoin is a digital currency and blockchain service platform."
 arch=('x86_64')
@@ -15,29 +17,24 @@ source_x86_64=("https://github.com/emercoin/emercoin/releases/download/v${pkgver
 "emercoind.service"
 "emc48.png"
 "com.emercoin.Emercoin.desktop")
-sha256sums_x86_64=('59d06b9cb647db790ddaad4b0d1457af6b3ef806cd7c8cf8bbbcdb29e586d1b3'
+sha256sums_x86_64=('9abe9f60f1674f19a31509d8ec0ab63b78d9c6ded9c017fad061e8edda0e9299'
                    '9d430f8bc61ce2f7c4e1f4b297065b5b6adad92d7dd4088e9a3bb7ba7751feff'
                    '9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
                    '99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
                    'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf')
+
 package() {
-    install -Dm644 ${srcdir}/emercoind.service ${pkgdir}/usr/lib/systemd/system/emercoind.service
-    install -Dm644 "${srcdir}"/com.emercoin.Emercoin.desktop ${pkgdir}/usr/share/applications/com.emercoin.Emercoin.desktop
-    install -Dm644 "${srcdir}"/emc48.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
-    cd "${_archive}"
-		install -Dm755 emercoind $pkgdir/usr/bin/emercoind
-		install -Dm755 emercoin-qt $pkgdir/usr/bin/emercoin-qt
-		install -Dm755 emercoin-cli $pkgdir/usr/bin/emercoin-cli
-#    install -Dm6750 emercoind $pkgdir/usr/bin/emercoind
-#    install -Dm6750 emercoin-qt $pkgdir/usr/bin/emercoin-qt
-#    install -Dm6750 emercoin-cli $pkgdir/usr/bin/emercoin-cli
-#    install -Dm444  ./include/emercoinconsensus.h $pkgdir/usr/include/emercoinconsensus.h
-#    install -D ./lib/libemercoinconsensus.so $pkgdir/usr/lib/libemercoinconsensus.so
-#    install -D ./lib/libemercoinconsensus.so.0 $pkgdir/usr/lib/libemercoinconsensus.so.0
-#    install -Dm6770  ./lib/libemercoinconsensus.so.0.0.0 $pkgdir/usr/lib/libemercoinconsensus.so.0.0.0
-    #install -Dm444  ./share/man/man1/bitcoind.1 $pkgdir/share/man/man1/bitcoind.1
-    #install -Dm444  ./share/man/man1/bitcoin-qt.1 $pkgdir/share/man/man1/bitcoin-qt.1
-    #install -Dm444  ./share/man/man1/bitcoin-tx.1 $pkgdir/share/man/man1/bitcoin-tx.1
-    #install -Dm444  ./share/man/man1/bitcoin-cli.1 $pkgdir/share/man/man1/bitcoin-cli.1
+  _pkgdir="${pkgdir}"
+  _systemddir="usr/lib/systemd/system"
+  _package
+}
 
+_package() {
+    install -Dm644 ${srcdir}/emercoind.service ${_pkgdir}/usr/lib/systemd/system/emercoind.service
+    install -Dm644 "${srcdir}"/com.emercoin.Emercoin.desktop ${_pkgdir}/usr/share/applications/com.emercoin.Emercoin.desktop
+    install -Dm644 "${srcdir}"/emc48.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
+		install -Dm755 ${_archive}/emercoind ${_pkgdir}/usr/bin/emercoind
+		install -Dm755 ${_archive}/emercoin-qt ${_pkgdir}/usr/bin/emercoin-qt
+		install -Dm755 ${_archive}/emercoin-cli ${_pkgdir}/usr/bin/emercoin-cli
+    chmod +x ${_pkgdir}/usr/bin/*
 }
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 764a6da0f554..a5d643d523cd 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -1,72 +1,40 @@
-pkgname=emercoin-bin
-_pkgname=emercoin-bin
-pkgver=0.7.12
+source PKGBUILD
 _pkgver=${pkgver}
-pkgrel=1
 _pkgrel=${pkgrel}
 pkgdesc="Emercoin is a digital currency and blockchain service platform. Debian package."
-arch=('x86_64')
 _pkgarch=$(dpkg --print-architecture)
-depends=("libevent>=2.1.8" "qt5-base" "dbus>=1.10.14" "miniupnpc>=2.0.20170509" "expat>=2.2.0" "freetype2>=2.7.1" "protobuf")
-_debdeps="libboost-filesystem1.74.0 (>= 1.74.0), libc6 (>= 2.30), libdb5.3++, libevent-2.1-7 (>= 2.1.8-stable), libevent-pthreads-2.1-7 (>= 2.1.8-stable), libgcc-s1 (>= 3.0), libleveldb1d, libminiupnpc17 (>= 1.9.20140610), libqrencode4 (>= 3.2.0), libqt5core5a (>= 5.15.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.14.1) | libqt5gui5-gles (>= 5.14.1), libqt5network5 (>= 5.0.2), libqt5widgets5 (>= 5.15.1), libsqlite3-0 (>= 3.7.15), libstdc++6 (>= 9), libzmq5 (>= 4.0.1+dfsg)"
+arch=('any')
 makedepends=('dpkg')
-provides=('emercoin')
-conflicts=('emercoin')
-url="http://emercoin.com/"
-license=('GPL3')
-install='emercoin.install'
-_archive="emercoin-${pkgver}-x86_64-linux-gnu"
-source_x86_64=("https://github.com/emercoin/emercoin/releases/download/v${pkgver}emc/${_archive}.tar.xz"
-"emercoin.install"
-"emercoind.service"
-"emc48.png"
-"com.emercoin.Emercoin.desktop")
-sha256sums_x86_64=('59d06b9cb647db790ddaad4b0d1457af6b3ef806cd7c8cf8bbbcdb29e586d1b3'
-                   '9d430f8bc61ce2f7c4e1f4b297065b5b6adad92d7dd4088e9a3bb7ba7751feff'
-                   '9e0832225a161a0c2694890e4d1791eedf943f96556db153e3cd5e40906ef5ed'
-                   '99d13ec06eb0d09662632e9eb6309ee38e03162f09513b23747f189602552132'
-                   'dfa7a4c2f717bbc29ba4273d65f80e0ee5853379e0632e458ae12df1ace72fcf')
+_debdeps="libboost-filesystem1.74.0 (>= 1.74.0), libc6 (>= 2.30), libdb5.3++, libevent-2.1-7 (>= 2.1.8-stable), libevent-pthreads-2.1-7 (>= 2.1.8-stable), libgcc-s1 (>= 3.0), libleveldb1d, libminiupnpc17 (>= 1.9.20140610), libqrencode4 (>= 3.2.0), libqt5core5a (>= 5.15.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.14.1) | libqt5gui5-gles (>= 5.14.1), libqt5network5 (>= 5.0.2), libqt5widgets5 (>= 5.15.1), libsqlite3-0 (>= 3.7.15), libstdc++6 (>= 9), libzmq5 (>= 4.0.1+dfsg)"
+noextract=(
+"${_archive}.tar.xz"
+)
 
 build() {
-	### CONTROL FILES CREATION ###
-	#create control file for the debian package
-	echo "Package: ${_pkgname}" > ${srcdir}/control
-	echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/control
-	echo "Priority: optional" >> ${srcdir}/control
-	echo "Section: web" >> ${srcdir}/control
-	echo "Architecture: ${_pkgarch}" >> ${srcdir}/control
-	echo "Depends: ${_debdeps}" >> ${srcdir}/control
-	echo "Maintainer: Moses Narrow" >> ${srcdir}/control
-	echo "Description: ${pkgdesc}" >> ${srcdir}/control
+    #create control file for the debian package
+    echo "Package: ${pkgname}" > ${srcdir}/control
+    echo "Version: ${pkgver}-${_pkgrel}" >> ${srcdir}/control
+    echo "Priority: optional" >> ${srcdir}/control
+    echo "Section: web" >> ${srcdir}/control
+    echo "Architecture: amd64" >> ${srcdir}/control
+    echo "Depends: ${_debdeps}" >> ${srcdir}/control
+    echo "Provides: ${_pkgname}" >> ${srcdir}/control
+    echo "Maintainer: ${_githuborg}" >> ${srcdir}/control
+    echo "Description: ${pkgdesc}" >> ${srcdir}/control
 }
 
 package() {
-	_debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}"
-	echo "${_debpkgdir}"
-	_pkgdir="${pkgdir}/${_debpkgdir}"
-	mkdir -p ${_pkgdir}/
-	######
-	install -Dm644 ${srcdir}/emercoind.service ${_pkgdir}/usr/lib/systemd/system/emercoind.service
-	install -Dm644 "${srcdir}"/com.emercoin.Emercoin.desktop ${_pkgdir}/usr/share/applications/com.emercoin.Emercoin.desktop
-	install -Dm644 "${srcdir}"/emc48.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/emercoin.png
-	cd "${_archive}"
-	install -Dm755 emercoind $_pkgdir/usr/bin/emercoind
-	install -Dm755 emercoin-qt $_pkgdir/usr/bin/emercoin-qt
-	install -Dm755 emercoin-cli $_pkgdir/usr/bin/emercoin-cli
-	######
-	_msg2 'installing control file'
-	install -Dm755 ${srcdir}/control ${_pkgdir}/DEBIAN/control
-
-	_msg2 'creating the debian package'
-	cd $pkgdir
-	dpkg-deb --build -z9 ${_debpkgdir}
-	mv *.deb ../../
-	#exit so the arch package doesn't get built
-	exit
-}
-
-_msg2() {
-	(( QUIET )) && return
-	local mesg=$1; shift
-	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
+#set up to create a .deb package
+_debpkgdir="${pkgname}-${pkgver}-${pkgrel}-${_pkgarch}"
+_pkgdir="${pkgdir}/${_debpkgdir}"
+[[ -d "${_pkgdir}" ]] && rm -rf "${_pkgdir}"
+_systemddir="etc/systemd/system"
+_package
+install -Dm755 "${srcdir}/control" "${_pkgdir}/DEBIAN/control"
+#create the debian package!
+cd "${pkgdir}"
+dpkg-deb --build -z9 "${_debpkgdir}"
+mv *.deb ../../
+#exit so the arch package doesn't get built
+exit
 }