Fix build error and wrong license

Remove obsolete parameter to stop virtualenv from complaining about an unrecognized argument (that is already default by now)
Fix package using wrong license (The project is using MPL 2.0)
This commit is contained in:
Manuel 2020-06-01 06:35:29 +02:00
parent 446b7aed8b
commit 5833ae8cbe
2 changed files with 9 additions and 6 deletions

View file

@ -1,12 +1,12 @@
pkgbase = mozilla-firefox-sync-server-git pkgbase = mozilla-firefox-sync-server-git
pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+ pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+
pkgver = 1.8.0.r32.gbebd2f3 pkgver = 1.8.0.r67.g516807e
pkgrel = 1 pkgrel = 1
url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html
install = mozilla-firefox-sync-server-git.install install = mozilla-firefox-sync-server-git.install
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = GPL license = MPL2
makedepends = git makedepends = git
depends = python2 depends = python2
depends = python2-virtualenv depends = python2-virtualenv

View file

@ -2,12 +2,12 @@
# Contributor: Timothée Ravier <tim@siosm.fr> # Contributor: Timothée Ravier <tim@siosm.fr>
pkgname=mozilla-firefox-sync-server-git pkgname=mozilla-firefox-sync-server-git
pkgver=1.8.0.r32.gbebd2f3 pkgver=1.8.0.r67.g516807e
pkgrel=1 pkgrel=1
pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+" pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html' url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html'
license=('GPL') license=('MPL2')
depends=('python2' 'python2-virtualenv') depends=('python2' 'python2-virtualenv')
makedepends=('git') makedepends=('git')
options=(!debug) options=(!debug)
@ -34,13 +34,16 @@ prepare() {
# Change default sqlite database location # Change default sqlite database location
sed -i "s|/tmp/syncserver.db|/var/lib/ffsync/sync_storage.db|g" syncserver.ini sed -i "s|/tmp/syncserver.db|/var/lib/ffsync/sync_storage.db|g" syncserver.ini
# Remove obsolete parameter
sed -i "s|--no-site-packages||g" Makefile
} }
build() { build() {
cd ${pkgname} cd ${pkgname}
make build make build
# PostgreSQL support # PostgreSQL support (please uncomment)
#local/bin/pip install psycopg2 #local/bin/pip install psycopg2
# There is no install target in the Makefile, so let's do some cleaning # There is no install target in the Makefile, so let's do some cleaning