From ab3cb96b9e23559e83cfef5c9d9f11303b510f38 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Mar 2015 16:19:39 +0900 Subject: [PATCH] hopefully fix %__ghc_lib_path for package .conf --- ghc-deps.sh | 2 +- ghc_lib.attr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-deps.sh b/ghc-deps.sh index a305b0e..68498ff 100755 --- a/ghc-deps.sh +++ b/ghc-deps.sh @@ -49,7 +49,7 @@ for i in $files; do */package.conf.d/*.conf) META=ghc-devel PKGVER=$(echo $i | sed -e "s%$PKGCONFDIR/\(.\+\).conf%\1%") - if [ -f $PKGBASEDIR/$PKGVER/libHS$PKGVER-*.so ]; then + if [ -f $PKGBASEDIR/$PKGVER/libHS$PKGVER-ghc${GHC_VER}.so ]; then SELF=ghc fi ;; diff --git a/ghc_lib.attr b/ghc_lib.attr index fc5750a..1ef544e 100644 --- a/ghc_lib.attr +++ b/ghc_lib.attr @@ -1,3 +1,3 @@ %__ghc_lib_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} %__ghc_lib_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} -%__ghc_lib_path ^%{ghclibdir}/(.*/libHS.*\\.so|package\\.conf\\.d/*\\.conf)$ +%__ghc_lib_path ^%{ghclibdir}/(.*/libHS.*\\.so|package\\.conf\\.d/.*\\.conf)$