[arch-commits] Commit in haskell-setlocale/trunk (PKGBUILD haskell-setlocale.install)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:40:24
  Author: fyan
Revision: 176959

upgpkg: haskell-setlocale 1.0.0.3-3

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1

Modified:
  haskell-setlocale/trunk/PKGBUILD
Deleted:
  haskell-setlocale/trunk/haskell-setlocale.install

---------------------------+
 PKGBUILD                  |   16 ++++++++++------
 haskell-setlocale.install |   18 ------------------
 2 files changed, 10 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:39:58 UTC (rev 176958)
+++ PKGBUILD	2016-05-25 14:40:24 UTC (rev 176959)
@@ -4,17 +4,19 @@
 pkgname=haskell-setlocale
 _hkgname=setlocale
 pkgver=1.0.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Haskell bindings to setlocale"
 url="http://hackage.haskell.org/package/setlocale"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc')
-options=('staticlibs')
-install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/setlocale/${pkgver}/setlocale-${pkgver}.tar.gz)
 md5sums=('348690842f5233f0e42e16bd615f777e')
 
+prepare() {
+    sed -i 's/base >=4.6 && <4.9/base >=4.6 \&\& <4.10/' setlocale-${pkgver}/setlocale.cabal
+}
+
 build() {
     cd ${srcdir}/setlocale-${pkgver}
     runhaskell Setup configure -O --enable-library-profiling --enable-split-objs --enable-shared \
@@ -23,13 +25,15 @@
     runhaskell Setup haddock
     runhaskell Setup register   --gen-script
     runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/setlocale-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    cd "${srcdir}/setlocale-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
     install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
     ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
 

Deleted: haskell-setlocale.install
===================================================================
--- haskell-setlocale.install	2016-05-25 14:39:58 UTC (rev 176958)
+++ haskell-setlocale.install	2016-05-25 14:40:24 UTC (rev 176959)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-setlocale
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}