Update license (GPL3)

3 files changed, 14 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 399dd6384253..985eb16e3431 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = zmninja
 	pkgdesc = High performance, cross platform ionic app for Home/Commerical Security Surveillance using ZoneMinder or other NVRs
 	pkgver = 1.6.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pliablepixels/zmNinja
 	arch = x86_64
-	license = custom:cc-by-nc-sa-4.0
+	license = GPL3
 	license = custom
 	depends = gconf
 	options = !strip
 	source = https://github.com/pliablepixels/zmNinja/releases/download/v1.6.009/zmninja-pro-1.6.9-linux-x86_64.AppImage
 	source = zmninja.desktop
-	source = cc-by-nc-sa-4.0.txt
 	source = LICENSE
 	source = zmninja.png
 	sha256sums = 33bfc587ba64380442ec9bb2d94f5f3bf67f630f072fb76a0b9d743ebc69e92b
 	sha256sums = 9f3663299da4be200b56e0d244ed4a9949435362906c607ac84083cb825a4102
-	sha256sums = cd9832c492786274823efa8d026ba57f45b51fabf37fc67b85069e1ed0c062b7
-	sha256sums = 02382b431a1885512de0b340a98077483c11e3432cd3997607b5d526f5b8f3f7
+	sha256sums = cad71380eaa58087318a10f960f3a7170308e39a0879a2c53a996339711d9fcd
 	sha256sums = 4e3490ae6e86aeb78893839727be5c145207ff1a083e3a3f2bc0163c057def4d
 
 pkgname = zmninja
diff --git a/LICENSE b/LICENSE
index c7dbdbf59b40..d0b49eaf0997 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,27 +1,7 @@
-License for apps on Play store/App store
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The apps in Apple App store and Google Play store can be used for any purpose (personal, commercial etc). After all, you've paid for it.
-
-
-For Desktop Clients Binaries: 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The Desktop clients binaries free to download and use ONLY for users
-who are using the desktop client with the free and open source ZoneMinder
-software. If you are selling a service based on ZoneMinder and are either distributing the Desktop Client to your users or asking your users to use the desktop client by download it themselves, you are violating the non-commercial use. You will need to procure a license before you do so.
-
-
-Source Code License
-~~~~~~~~~~~~~~~~~~~
-The source code of zmNinja is dual licensed.
-
-a) The code is free for personal, non commercial use
-http://creativecommons.org/licenses/by-nc-sa/4.0/
-In summary: Share Alike, Adapt,Attribute, NonCommercial
-
-b) zmNinja source code is also open for commercial licensing and white-labeling.
-Please contact pliablepixels@gmail.com
-
-
+License 
+~~~~~~~~~~
+zmNinja is GPL 3.0 licensed as of Jul 10, 2021
+See https://www.gnu.org/licenses/gpl-3.0.en.html
 
 Third Party credits
 ===================
@@ -39,14 +19,8 @@ http://soundbible.com/2067-Blop.html
 Version 1.1.0 and above of zmNinja uses Packery.
 http://packery.metafizzy.co
 
-A commercial single developer license has been purchased for the same.
-Note that this license allows me (pliablepixels) to use Packery for commercial
-apps that I develop (such as zmNinja). Given that I publish my source under
-CC BY-NC-SA 4.0, you can compile the code for your personal use (non commercial purposes)
-and continue to use Packery. This is compliant to Packery's license too, where they
-prohibit other developers to build for profit using the license I purchased.
+Since I switched to GPL v3, we can continue using Packery under its GPLv3 license as well
+See https://packery.metafizzy.co/license.html
+
 
-If however you purchase the source code from me, you will
-still have to purchase an additional license for Packery from David via http://packery.metafizzy.co/#commercial-license
-It's very cheap ($25 for unlimited products by one developer).
 
diff --git a/PKGBUILD b/PKGBUILD
index 571bda6f3dc4..55d64e47dcfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,18 @@
 pkgname=zmninja
 pkgver=1.6.9
 _pkgver=1.6.009
-pkgrel=1
+pkgrel=2
 pkgdesc="High performance, cross platform ionic app for Home/Commerical Security Surveillance using ZoneMinder or other NVRs"
 arch=(x86_64)
 options=(!strip)
 url="https://github.com/pliablepixels/zmNinja"
-license=('custom:cc-by-nc-sa-4.0' 'custom')
+license=('GPL3' 'custom')
 depends=('gconf')
 _zmninja_file="zmninja-pro-$pkgver-linux-$arch.AppImage"
-source=("https://github.com/pliablepixels/zmNinja/releases/download/v$_pkgver/$_zmninja_file" "zmninja.desktop" "cc-by-nc-sa-4.0.txt" "LICENSE" "zmninja.png")
+source=("https://github.com/pliablepixels/zmNinja/releases/download/v$_pkgver/$_zmninja_file" "zmninja.desktop" "LICENSE" "zmninja.png")
 sha256sums=('33bfc587ba64380442ec9bb2d94f5f3bf67f630f072fb76a0b9d743ebc69e92b'
             '9f3663299da4be200b56e0d244ed4a9949435362906c607ac84083cb825a4102'
-            'cd9832c492786274823efa8d026ba57f45b51fabf37fc67b85069e1ed0c062b7'
-            '02382b431a1885512de0b340a98077483c11e3432cd3997607b5d526f5b8f3f7'
+            'cad71380eaa58087318a10f960f3a7170308e39a0879a2c53a996339711d9fcd'
             '4e3490ae6e86aeb78893839727be5c145207ff1a083e3a3f2bc0163c057def4d')
 
 build() {
@@ -31,6 +30,5 @@ package() {
 	install -D -m755 $srcdir/$_zmninja_file usr/lib/$pkgname/$_zmninja_file
 	install -D -m644 $srcdir/$pkgname.desktop usr/share/applications/$pkgname.desktop
 	install -D -m644 $srcdir/LICENSE usr/share/licenses/$pkgname/LICENSE
-	install -D -m644 $srcdir/cc-by-nc-sa-4.0.txt usr/share/licenses/$pkgname/cc-by-nc-sa-4.0.txt
 	install -D -m644 $srcdir/zmninja.png usr/share/pixmaps/$pkgname.png
 }