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:
parent
446b7aed8b
commit
5833ae8cbe
2 changed files with 9 additions and 6 deletions
4
.SRCINFO
4
.SRCINFO
|
@ -1,12 +1,12 @@
|
|||
pkgbase = mozilla-firefox-sync-server-git
|
||||
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
|
||||
url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html
|
||||
install = mozilla-firefox-sync-server-git.install
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = GPL
|
||||
license = MPL2
|
||||
makedepends = git
|
||||
depends = python2
|
||||
depends = python2-virtualenv
|
||||
|
|
11
PKGBUILD
11
PKGBUILD
|
@ -2,12 +2,12 @@
|
|||
# Contributor: Timothée Ravier <tim@siosm.fr>
|
||||
|
||||
pkgname=mozilla-firefox-sync-server-git
|
||||
pkgver=1.8.0.r32.gbebd2f3
|
||||
pkgver=1.8.0.r67.g516807e
|
||||
pkgrel=1
|
||||
pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+"
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html'
|
||||
license=('GPL')
|
||||
license=('MPL2')
|
||||
depends=('python2' 'python2-virtualenv')
|
||||
makedepends=('git')
|
||||
options=(!debug)
|
||||
|
@ -34,14 +34,17 @@ prepare() {
|
|||
|
||||
# Change default sqlite database location
|
||||
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() {
|
||||
cd ${pkgname}
|
||||
make build
|
||||
|
||||
# PostgreSQL support
|
||||
# local/bin/pip install psycopg2
|
||||
# PostgreSQL support (please uncomment)
|
||||
#local/bin/pip install psycopg2
|
||||
|
||||
# There is no install target in the Makefile, so let's do some cleaning
|
||||
rm -rf .git .gitignore Dockerfile Makefile MANIFEST.in README.rst setup.py \
|
||||
|
|
Loading…
Reference in a new issue