[arch-commits] Commit in facter/trunk (PKGBUILD)

[Thore Bödecker]

    Date: Thursday, June 4, 2020 @ 13:47:47
  Author: foxxx0
Revision: 638908

upgpkg: facter 3.14.11-1: update to 3.14.11 + leatherman rebuild + libwhereami update

Modified:
  facter/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 13:46:42 UTC (rev 638907)
+++ PKGBUILD	2020-06-04 13:47:47 UTC (rev 638908)
@@ -9,8 +9,8 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=facter
-pkgver=3.14.6
-pkgrel=2
+pkgver=3.14.11
+pkgrel=1
 pkgdesc="Collect and display system facts"
 arch=('x86_64')
 url="https://puppetlabs.com/facter"
@@ -32,7 +32,7 @@
         'rapidjson-1.1-compat.patch'
         'workaround-broken-double-test.patch')
 validpgpkeys=('6F6B15509CF8E59E6E469F327F438280EF8D349F') # "Puppet, Inc. Release Key (Puppet, Inc. Release Key) <release at puppet.com>"
-sha512sums=('d0f821907f76b6737977ed1c487e1d61baed0d4bf2054af1c0946d78e8cebc3796736d0688aeef4e22a91d426f8e1e9b814ba4c2905abecb190f2d91981742bd'
+sha512sums=('e188e2ec3025cb14b2b64577792b193c30d715d4ef4c7a7981710900be2b8e82787f25107b5cf0a378b9c86a436241bacaaa233a7ce55b0fc8f8d4fe0e34c1d7'
             'SKIP'
             'c06f8b75a697c89c696729aaca88d30cf4d8652406245d457d97a0de973f6129a037e226847e71785070dc16d5b40b98f287258f961da7904cf5338eb601fc09'
             '1f5d2595cd6b2a63fc01c92c84eccf8f92bd9e9f0721ea1a3f59836d7d02f5ec6e6e3711b223b240d46ca55f7377f27339b7458c12d6c21564a2764c76df12b2'
@@ -69,16 +69,14 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  mkdir -p build
-  cd build
-
   export JAVA_HOME=/usr/lib/jvm/default
   cmake \
+    -B build \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DENABLE_CXX_WERROR=OFF \
-    -DBUILD_SHARED_LIBS=ON \
-    ..
-  make
+    -DBUILD_SHARED_LIBS=ON
+  make -C build
 }
 
 check(){
@@ -87,11 +85,11 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
-  install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim: ts=2 sw=2 et: