summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-06-21 14:02:44 +0200
committerbartus2020-06-21 14:14:35 +0200
commitc9194bec5edb8c695330146c4c7fdb90843116c6 (patch)
treeecf6e188e73aa27ac9eeccd943127d26a6495a43
parent26b9e7e99c9356d6f26efdf7f7bc8b984c89690e (diff)
downloadaur-c9194bec5edb8c695330146c4c7fdb90843116c6.tar.gz
Refactor:
* add git fragment * fix url * simplify install call in package()
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
2 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b2f397f367f9..f21338541fb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,8 @@
-# Generated by mksrcinfo v8
-# Thu Jan 4 20:11:05 UTC 2018
pkgbase = scilab-git
- pkgdesc = A scientific software package for numerical computations
+ pkgdesc = A scientific software package for numerical computations.
pkgver = 6.0.0.r296.g2f851190556
pkgrel = 1
- url = https://www.scilab.org/
+ url = https://www.scilab.org
arch = i686
arch = x86_64
license = custom:CeCILL
@@ -44,7 +42,7 @@ pkgbase = scilab-git
depends = java-batik>=1.8
provides = scilab
conflicts = scilab
- source = git://git.scilab.org/scilab
+ source = git://git.scilab.org/scilab#branch=master
source = scilab-jogl-2.3.2.patch
source = scilab-LD_LIBRARY_PATH.patch
source = scilab-strict-jar.patch
diff --git a/PKGBUILD b/PKGBUILD
index d36ccf226ba4..66fd663e02ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
# Contributor: Victor Dmitriyev <mrvvitek@gmail.com>
_pkgname=scilab
-pkgname=scilab-git
+_fragment="#branch=master"
+pkgname=${_pkgname}-git
pkgver=6.0.0.r296.g2f851190556
pkgrel=1
-pkgdesc='A scientific software package for numerical computations'
+pkgdesc='A scientific software package for numerical computations.'
arch=('i686' 'x86_64')
-url="https://www.scilab.org/"
+url='https://www.scilab.org'
license=('custom:CeCILL' 'BSD')
depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen'
'hdf5'
@@ -23,7 +24,7 @@ depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen'
makedepends=('apache-ant' 'git' 'ocaml' 'java-environment>=8' 'gcc-fortran')
provides=('scilab')
conflicts=('scilab')
-source=("git://git.scilab.org/scilab"
+source=("git://git.scilab.org/scilab${_fragment}"
"${_pkgname}-jogl-2.3.2.patch"
"${_pkgname}-LD_LIBRARY_PATH.patch"
"${_pkgname}-strict-jar.patch"
@@ -97,10 +98,8 @@ package() {
make DESTDIR="${pkgdir}" install
- install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/COPYING" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
- install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/COPYING-BSD" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD"
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+ install -Dm644 COPYING-BSD "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD"
}
# vim:set ts=2 sw=2 et: