summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2016-11-02 02:44:30 +0800
committerJingbei Li2016-11-02 02:44:30 +0800
commitca8037e2b181ad8c405d85a317e865885d18316c (patch)
treee52ab13293b552fc57a442dc5e009fdda413821a
parent49700231e7a5fa9fa9b4a664866ff0d3c272d221 (diff)
downloadaur-ca8037e2b181ad8c405d85a317e865885d18316c.tar.gz
make it conflict with hdf5 again
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD24
2 files changed, 10 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c889b485724..0e26d7f3b9fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Nov 1 17:48:37 UTC 2016
+# Tue Nov 1 18:44:24 UTC 2016
pkgbase = hdf5_18-cpp-fortran
pkgdesc = General purpose library and file format for storing scientific data
pkgver = 1.8.17
- pkgrel = 1
+ pkgrel = 2
url = http://www.hdfgroup.org/HDF5/
arch = i686
arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = hdf5_18-cpp-fortran
depends = zlib
depends = sh
depends = gcc-libs
- provides = hdf5_18
- conflicts = hdf5_18
+ provides = hdf5
+ conflicts = hdf5
source = ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-1.8.17.tar.bz2
sha1sums = 640f1a46cb1b353339695355b4fca42df05be765
diff --git a/PKGBUILD b/PKGBUILD
index 83e2eb2930ab..2094f9e7bc02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
pkgname=hdf5_18-cpp-fortran
_pkgname=hdf5
pkgver=1.8.17
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc="General purpose library and file format for storing scientific data"
url="http://www.hdfgroup.org/HDF5/"
license=('custom')
depends=('zlib' 'sh' 'gcc-libs')
makedepends=('time' 'gcc-fortran')
-provides=('hdf5_18')
-conflicts=('hdf5_18')
+conflicts=('hdf5')
+provides=('hdf5')
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
sha1sums=('640f1a46cb1b353339695355b4fca42df05be765')
@@ -25,11 +25,9 @@ build() {
--enable-linux-lfs \
--enable-build-mode=production \
--with-pic \
- --docdir=/usr/share/doc/hdf5_18/ \
- --with-pthread=/usr/lib \
- --disable-sharedlib-rpath \
- --libdir=/usr/lib/hdf5_18 \
- --includedir=/usr/include/hdf5_18
+ --docdir=/usr/share/doc/hdf5/ \
+ --with-pthread=/usr/lib/ \
+ --disable-sharedlib-rpath
make
}
@@ -38,16 +36,6 @@ package() {
make -j1 DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/share/hdf5_examples
-
- for file in "${pkgdir}"/usr/bin/*
- do
- mv "${file}" "${file}"_18
- done
-
- install -d m755 "${pkgdir}"/etc/ld.so.conf.d
- echo /usr/lib/hdf5_18 >> "${pkgdir}"/etc/ld.so.conf.d/hdf5_18.conf
-
install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"