Update to latest

3 files changed, 14 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eebf65ef45e9..005af017d362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = turtlecoin-git
-	pkgdesc = Turtlecoin simplewallet and miner
+	pkgdesc = TurtleCoin daemon, CLI wallet, RPC interface, and solo miner
 	pkgver = r402.a902436
 	pkgrel = 1
 	url = https://turtlecoin.lol
@@ -15,4 +15,3 @@ pkgbase = turtlecoin-git
 	sha256sums = SKIP
 
 pkgname = turtlecoin-git
-
diff --git a/PKGBUILD b/PKGBUILD
index de6e72fd957c..55554b1478ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,7 @@
-#
-# Please note:
-#   Export your keys using export_keys command in
-#   trtl-simplewallet before upgrading to version
-#   0.4.3 (r402.a902436).
-#   
-#   For more information visit:
-#       https://github.com/turtlecoin/turtlecoin/releases/tag/v0.4.3
-#
-
 pkgname=turtlecoin-git
-pkgver=r402.a902436
+pkgver=r1072.6ce73ea
 pkgrel=1
-pkgdesc="Turtlecoin simplewallet and miner"
+pkgdesc="TurtleCoin daemon, CLI wallet, RPC interface, and solo miner"
 arch=('x86_64')
 url="https://turtlecoin.lol"
 license=('LGPLv3')
@@ -32,15 +22,16 @@ pkgver() {
 
 build() {
     cd "$srcdir/turtlecoin"
-    mkdir -p build/release
-    cd build/release
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-fassociative-math" -DCMAKE_CXX_FLAGS="-fassociative-math" ../..
+    mkdir -p build
+    cd build
+    cmake ..
     make
 }
 
 package() {
-    install -D -m755 "$srcdir/turtlecoin/build/release/src/miner" -T "$pkgdir/usr/bin/trtl-miner"
-    install -D -m755 "$srcdir/turtlecoin/build/release/src/simplewallet" -T "$pkgdir/usr/bin/trtl-simplewallet"
-    install -D -m755 "$srcdir/turtlecoin/build/release/src/TurtleCoind" -t "$pkgdir/usr/bin/"
-    install -D -m755 "$srcdir/turtlecoin/build/release/src/walletd" -T "$pkgdir/usr/bin/trtl-walletd"
+    # Rename some executables so we don't conflict with other coins
+    install -D -m755 "$srcdir/turtlecoin/build/src/miner" -T "$pkgdir/usr/bin/trtl-miner"
+    install -D -m755 "$srcdir/turtlecoin/build/src/zedwallet" -T "$pkgdir/usr/bin/trtl-zedwallet"
+    install -D -m755 "$srcdir/turtlecoin/build/src/TurtleCoind" -t "$pkgdir/usr/bin/"
+    install -D -m755 "$srcdir/turtlecoin/build/src/turtle-service" -t "$pkgdir/usr/bin/"
 }
diff --git a/turtlecoin-git.install b/turtlecoin-git.install
index e1d519d6d533..2c684cb0c8ec 100644
--- a/turtlecoin-git.install
+++ b/turtlecoin-git.install
@@ -1,42 +1,12 @@
 binary_message() {
     echo "To prevent problems with software of other coins the binaries for this package are as follows:"
-    echo "  connectivity_tool => trtl-connectivity_tool"
     echo "  miner => trtl-miner"
-    echo "  simplewallet => trtl-simplewallet"
-    echo "  walletd => trtl-walletd"
+    echo "  zedwallet => trtl-zedwallet"
+    echo "  TurtleCoind => unchanged"
+    echo "  turtle-service => unchanged"
     echo
 }
 
-to_v0.3.2_upgrade_message() {
-cat << EOF
-
-How To Upgrade from an older version to v0.3.2 (r135.7fcc6ad):
-    * run the old TurtleCoind to sync your chain fully
-    * with the old TurtleCoind fully synced, open simplewallet
-    * open your wallet
-    * export your SPEND and VIEW keys with export_keys, this is important.
-    * Close the old version folder TurtleCoind and simplewallet by typing exit into each window
-    * Run the new TurtleCoind
-    * Run the new simplewallet
-    * Press I for IMPORT in simplewallet
-    * Use any filename for the wallet name, it does not have to be the same
-    * Use any password for wallet password, it does not have to be the same as the last
-    * Enter your spend_key and your view_key from step 4
-
-For more information visit:
-    https://github.com/turtlecoin/turtlecoin/releases/tag/v0.3.2
-
-EOF
-}
-
-pre_install() {
-    to_v0.3.2_upgrade_message
-}
-
-pre_upgrade() {
-    to_v0.3.2_upgrade_message
-}
-
 post_install() {
     binary_message
 }