summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksii Vilchanskyi2017-05-18 21:17:45 +0200
committerOleksii Vilchanskyi2017-05-18 21:17:45 +0200
commit7d7f89c0d1752b8da02f9178a883f270dcc197a2 (patch)
tree551605952ccbcd3bede0a88496a19ac146acd05a
parent0f2317224052dfc2c925880d6b463771236aad85 (diff)
downloadaur-7d7f89c0d1752b8da02f9178a883f270dcc197a2.tar.gz
Update to 3.8.0, add fasm to conflicts
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD7
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27fecb37cd2..283d1fec45c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Apr 4 05:28:48 UTC 2016
pkgbase = sasm
pkgdesc = Simple crossplatform IDE for NASM, MASM, GAS, FASM assembly languages
- pkgver = 3.5.0
- pkgrel = 2
+ pkgver = 3.8.0
+ pkgrel = 1
url = http://dman95.github.io/SASM/english.html
arch = i686
arch = x86_64
@@ -12,9 +10,10 @@ pkgbase = sasm
depends = nasm
depends = gdb
depends = gcc
- source = https://github.com/Dman95/SASM/archive/v3.5.0.tar.gz
- sha256sums = f79d6f2986df97207342617c90b4d8d984b9ebb2302c215bdcea6acfcf4eff2a
- depends_x86_64 = gcc-multilib
+ depends = gcc-multilib
+ conflicts = fasm
+ source = https://github.com/Dman95/SASM/archive/v3.8.0.tar.gz
+ sha256sums = c61ac0de8959e2d5e2d6fa20718f97bfbc0ed79c0c7d80f14b4dedcab93dd0d7
pkgname = sasm
diff --git a/PKGBUILD b/PKGBUILD
index df3b4c4e7a1..075222231e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
# Contributor: V0K3 <v0k3@inventati.org>
pkgname=sasm
-pkgver=3.5.0
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
pkgdesc="Simple crossplatform IDE for NASM, MASM, GAS, FASM assembly languages"
arch=('i686' 'x86_64')
url="http://dman95.github.io/SASM/english.html"
license=('GPL3')
depends=('qt4>=4.8' 'nasm' 'gdb' 'gcc')
depends_x86_64+=('gcc-multilib')
+conflicts=('fasm')
source=("https://github.com/Dman95/SASM/archive/v${pkgver}.tar.gz")
-sha256sums=('f79d6f2986df97207342617c90b4d8d984b9ebb2302c215bdcea6acfcf4eff2a')
+sha256sums=('c61ac0de8959e2d5e2d6fa20718f97bfbc0ed79c0c7d80f14b4dedcab93dd0d7')
build() {
cd "${srcdir}/SASM-${pkgver}"