electrum

commit 56a399e1da2117992ec4dc4d794bf860740ea243
parent 7043d6907f1af3dbb67f04d77147079e47b3dae5
Author: SomberNight <somber.night@protonmail.com>
Date:   Sun, 10 Jun 2018 22:12:23 +0200

fix revealer for linux distributables; and small clean-up

Diffstat:
M
contrib/build-osx/osx.spec
 | 
6
+-----
M
contrib/build-wine/deterministic.spec
 | 
6
+-----
R
plugins/revealer/LICENSE_DEJAVU -> plugins/revealer/LICENSE_DEJAVU.txt
 | 
0

M
setup.py
 | 
12
+++---------

4 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/contrib/build-osx/osx.spec b/contrib/build-osx/osx.spec
@@ -28,11 +28,7 @@ hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 
 datas = [
-    (electrum+'lib/currencies.json', PYPKG),
-    (electrum+'lib/servers.json', PYPKG),
-    (electrum+'lib/checkpoints.json', PYPKG),
-    (electrum+'lib/servers_testnet.json', PYPKG),
-    (electrum+'lib/checkpoints_testnet.json', PYPKG),
+    (electrum+'lib/*.json', PYPKG),
     (electrum+'lib/wordlist/english.txt', PYPKG + '/wordlist'),
     (electrum+'lib/locale', PYPKG + '/locale'),
     (electrum+'plugins', PYPKG + '_plugins'),
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -31,11 +31,7 @@ binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]
 binaries += [('C:/tmp/libsecp256k1.dll', '.')]
 
 datas = [
-    (home+'lib/currencies.json', 'electrum'),
-    (home+'lib/servers.json', 'electrum'),
-    (home+'lib/checkpoints.json', 'electrum'),
-    (home+'lib/servers_testnet.json', 'electrum'),
-    (home+'lib/checkpoints_testnet.json', 'electrum'),
+    (home+'lib/*.json', 'electrum'),
     (home+'lib/wordlist/english.txt', 'electrum/wordlist'),
     (home+'lib/locale', 'electrum/locale'),
     (home+'plugins', 'electrum_plugins'),
diff --git a/plugins/revealer/LICENSE_DEJAVU b/plugins/revealer/LICENSE_DEJAVU.txt
diff --git a/setup.py b/setup.py
@@ -65,6 +65,7 @@ setup(
         'electrum_plugins.keepkey',
         'electrum_plugins.labels',
         'electrum_plugins.ledger',
+        'electrum_plugins.revealer',
         'electrum_plugins.trezor',
         'electrum_plugins.digitalbitbox',
         'electrum_plugins.trustedcoin',
@@ -76,17 +77,10 @@ setup(
         'electrum_plugins': 'plugins',
     },
     package_data={
+        '': ['*.txt', '*.json', '*.ttf', '*.otf'],
         'electrum': [
-            'servers.json',
-            'servers_testnet.json',
-            'servers_regtest.json',
-            'currencies.json',
-            'checkpoints.json',
-            'checkpoints_testnet.json',
-            'www/index.html',
-            'wordlist/*.txt',
             'locale/*/LC_MESSAGES/electrum.mo',
-        ]
+        ],
     },
     scripts=['electrum'],
     data_files=data_files,