summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Brains2018-07-28 08:11:00 +0300
committerJoseph Brains2018-07-28 08:11:00 +0300
commit80586203f2dc38466135772b7543ee66fc76e252 (patch)
tree72e09aa6c1dcb1335800852250a19147d8f7d397
parentacfd44f51323a63507ee073ecdeb6f0fd22d7daf (diff)
downloadaur-80586203f2dc38466135772b7543ee66fc76e252.tar.gz
Change git to pull from 2.1 branch
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD22
2 files changed, 18 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ff8e3a4d0a2..297391272ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = gns3-server-git
pkgdesc = GNS3 network simulator. Server package.
- pkgver = 2.1.8
- pkgrel = 3
+ pkgver = v2.1.8.r3.g17e51fda
+ pkgrel = 1
url = https://github.com/GNS3/gns3-server
install = gns3-server.install
arch = any
groups = gns3
license = GPL3
+ makedepends = git
makedepends = python-setuptools
depends = python-jsonschema>=2.4.0
depends = python-jinja>=2.7.3
@@ -25,10 +26,9 @@ pkgbase = gns3-server-git
optdepends = gns3-gui: graphical user interface for GNS3 server.
provides = gns3-server
conflicts = gns3-server
- replaces = gns3-server
- source = gns3-server-2.1.8.tar.gz::https://github.com/GNS3/gns3-server/archive/v2.1.8.tar.gz
+ source = gns3-server::git+git://github.com/GNS3/gns3-server.git#branch=2.1
source = gns3-server@.service
- sha256sums = 8bccf2ba16832743e0743f11fe19f506172af07c68d2eae156ea1b946415b1a0
+ sha256sums = SKIP
sha256sums = d145c7a4b7163aecd91b71a0769130d62beb5f4381fe5437774f6b4477a3fa48
pkgname = gns3-server-git
diff --git a/PKGBUILD b/PKGBUILD
index 9415a4a2ab5..e672d897cf4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,16 @@
# Maintainer: Joseph Brains <jnbrains@gmail.com>
_pkgname=gns3-server
pkgname=${_pkgname}-git
-pkgver=2.1.8
-pkgrel=3
+pkgver=v2.1.8.r3.g17e51fda
+pkgrel=1
pkgdesc='GNS3 network simulator. Server package.'
arch=('any')
url="https://github.com/GNS3/${_pkgname}"
license=('GPL3')
groups=('gns3')
-replaces=('gns3-server')
provides=('gns3-server')
conflicts=('gns3-server')
-makedepends=('python-setuptools')
+makedepends=('git' 'python-setuptools')
depends=('python-jsonschema>=2.4.0' 'python-jinja>=2.7.3' 'python-raven>=5.23.0' 'python-psutil>=3.0.0' 'python-zipstream-gns3' 'python-yarl-gns3' 'python-aiohttp-gns3' 'python-aiohttp-cors-gns3' 'python-prompt_toolkit-gns3' 'python-async-timeout-gns3')
optdepends=('dynamips: Cisco router emulator.'
'qemu: Used by GNS3 to run Cisco ASA, PIX and IDS.'
@@ -20,19 +19,24 @@ optdepends=('dynamips: Cisco router emulator.'
'gns3-gui: graphical user interface for GNS3 server.'
)
install="${_pkgname}.install"
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/GNS3/${_pkgname}/archive/v${pkgver}.tar.gz"
+source=("${_pkgname}::git+git://github.com/GNS3/${_pkgname}.git#branch=2.1"
"${_pkgname}@.service")
-sha256sums=('8bccf2ba16832743e0743f11fe19f506172af07c68d2eae156ea1b946415b1a0'
+sha256sums=('SKIP'
'd145c7a4b7163aecd91b71a0769130d62beb5f4381fe5437774f6b4477a3fa48')
+pkgver() {
+ cd ${srcdir}/${_pkgname}
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
prepare() {
- cd ${srcdir}/${_pkgname}-${pkgver}
+ cd ${srcdir}/${_pkgname}
sed -i '/^typing/d' requirements.txt
}
package() {
- cd ${srcdir}/${_pkgname}-${pkgver}
+ cd ${srcdir}/${_pkgname}
python3 setup.py install --root=${pkgdir} --optimize=1
- install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
+ install -Dm644 ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
install -Dm644 ${srcdir}/${_pkgname}@.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}@.service
}