From 3b3731d873664db00c02603363f61d34c41a3990 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 25 Apr 2016 22:13:19 -0400
Subject: embed pixelated

---
 pkg/pyinst/bitmask.spec.orig | 38 --------------------------------------
 pkg/pyinst/pyinst-build.mk   |  3 ++-
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkg/pyinst/bitmask.spec.orig

(limited to 'pkg')

diff --git a/pkg/pyinst/bitmask.spec.orig b/pkg/pyinst/bitmask.spec.orig
deleted file mode 100644
index 617104b9..00000000
--- a/pkg/pyinst/bitmask.spec.orig
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- mode: python -*-
-
-block_cipher = None
-
-
-a = Analysis([os.path.join('bitmask.py')],
-             hiddenimports=[
-	     	'zope.interface', 'zope.proxy',
-		'PySide.QtCore', 'PySide.QtGui'],
-             hookspath=None,
-             runtime_hooks=None,
-             excludes=None,
-             cipher=block_cipher)
-pyz = PYZ(a.pure,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='bitmask',
-          debug=False,
-          strip=False,
-          upx=True,
-          console=False )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='bitmask')
-if sys.platform.startswith("darwin"):
-	app = BUNDLE(coll,
-		     name=os.path.join(
-		      'dist', 'Bitmask.app'),
-                     appname='Bitmask',
-                     version='0.9.0rc2',
-		     icon='pkg/osx/bitmask.icns',
-		     bundle_identifier='bitmask-0.9.0rc2')
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index 92a1cbb3..3c514a02 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -22,7 +22,8 @@ reset-ver:
 
 pyinst-hacks-linux:
 	# XXX this should be taken care of by pyinstaller data collector
-	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
+	#cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
+	cp ../leap_common/src/leap/common/cacert.pem $(DIST)
 	mkdir -p $(DIST)pysqlcipher
 	mkdir -p $(DIST)pixelated
 	mkdir -p $(DIST)twisted/web
-- 
cgit v1.2.3