Bugfixes

3 files changed, 11 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e8c09419f17..7bbb20b414a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,25 @@
 # Generated by mksrcinfo v8
-# Thu Dec 22 13:28:13 UTC 2016
+# Thu Dec 22 14:27:20 UTC 2016
 pkgbase = bitcoin-classic-git
 	pkgdesc = Bitcoin Classic versions of Bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt, most recent stable branch, w/GUI and wallet
 	pkgver = v1.2.0.b1.r55.g95803467
 	pkgrel = 1
 	url = https://bitcoinclassic.com/
 	install = bitcoin-qt.install
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = MIT
 	makedepends = boost
-	makedepends = libevent
-	makedepends = qt5-base
 	makedepends = qt5-tools
-	makedepends = qrencode
-	makedepends = protobuf
 	depends = boost-libs
-	depends = miniupnpc
 	depends = desktop-file-utils
 	depends = libevent
 	depends = qt5-base
 	depends = protobuf
-	depends = qrencode
 	depends = openssl
+	depends = miniupnpc
+	depends = zeromq
+	depends = qrencode
 	provides = bitcoin-daemon
 	provides = bitcoin-cli
 	provides = bitcoin-qt
diff --git a/PKGBUILD b/PKGBUILD
index 7b7fbb78ee30..e767282ac835 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Tom Zander
 
 pkgname=bitcoin-classic-git
-pkgver=v1.2.0.b1.r55.g95803467
+pkgver=v1.2.0.b1
 pkgrel=1
 pkgdesc='Bitcoin Classic versions of Bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt, most recent stable branch, w/GUI and wallet'
-arch=('any')
+arch=('i686' 'x86_64')
 url="https://bitcoinclassic.com/"
 license=('MIT')
-depends=('boost-libs' 'miniupnpc' 'desktop-file-utils' 'libevent' 'qt5-base' 'protobuf' 'qrencode' 'openssl')
-makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'protobuf')
+depends=('boost-libs' 'desktop-file-utils' 'libevent' 'qt5-base' 'protobuf' 'openssl' 'miniupnpc' 'zeromq' 'qrencode')
+makedepends=('boost' 'qt5-tools')
 provides=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx')
 conflicts=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx')
 install=bitcoin-qt.install
@@ -26,7 +26,6 @@ build() {
   cd "$srcdir/bitcoinclassic"
 
   msg2 'Building...'
-  CXXFLAGS="$CXXFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1"
   ./autogen.sh
   ./configure --prefix=/usr --with-incompatible-bdb --with-gui=qt5 --enable-hardening \
         --enable-reduce-exports --disable-gui-tests --disable-maintainer-mode \
@@ -63,7 +62,7 @@ package() {
 
   msg2 'Installing bitcoin.conf...'
   # Install bitcoin.conf is one does not already exist
-  [[ ! -e "/etc/bitcoin/bitcoin.conf" ]] && install -Dm 600 \
+  [[ ! -e "/etc/bitcoin/bitcoin.conf" ]] && install -Dm 644 \
   "$srcdir/bitcoinclassic/contrib/debian/examples/bitcoin.conf" -t "$pkgdir/etc/bitcoin"
 
   msg2 'Installing bitcoin.service...'
diff --git a/bitcoin-qt.install b/bitcoin-qt.install
index edec8b45c6a4..8f20cf484d13 100644
--- a/bitcoin-qt.install
+++ b/bitcoin-qt.install
@@ -1,36 +1,11 @@
 post_install() {
     update-desktop-database -q
-    printf "%b\n" "$bitcoin"
 }
 
 post_upgrade() {
     update-desktop-database -q
-    printf "%b\n" "$bitcoin"
 }
 
 post_remove() {
     update-desktop-database -q
 }
-
-read -d '' bitcoin <<'EOF'
-########################################################################
-########################################################################
-##                                                                    ##
-##  Bitcoin Classic                                                   ##
-##  ____________                                                      ##
-##                                                                    ##
-##  New to 0.12, when no -rpcpassword is specified, the daemon now    ##
-##  uses a special 'cookie' file for authentication. This file is     ##
-##  generated with random content when the daemon starts, and deleted ##
-##  when it exits. Its contents are used as authentication token.     ##
-##  Read access to this file controls who can access through RPC. By  ##
-##  default it is stored in the data directory but its location can   ##
-##  be overridden with the option -rpccookiefile. This is similar to  ##
-##  Tor's CookieAuthentication.                                       ##
-##  see:  https://www.torproject.org/docs/tor-manual.html.en          ##
-##  This allows running bitcoind without having to do any manual      ##
-##  configuration.                                                    ##
-##                                                                    ##
-########################################################################
-########################################################################
-EOF