[ghc-rpm-macros] ghc.attr needs to handle requires for /usr/bin files too
Jens Petersen
petersen at fedoraproject.org
Thu Oct 16 06:51:46 UTC 2014
commit 33502e39eb7330e2de440742cb3728d812754694
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Oct 16 15:51:29 2014 +0900
ghc.attr needs to handle requires for /usr/bin files too
ghc-rpm-macros.spec | 5 ++++-
ghc.attr | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 8e0c30f..1b50f73 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
-Version: 1.3.6
+Version: 1.3.7
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@@ -93,6 +93,9 @@ EOF
%changelog
+* Mon Sep 29 2014 Jens Petersen <petersen at redhat.com> - 1.3.7-1
+- ghc.attr needs to handle requires for /usr/bin files too
+
* Wed Sep 10 2014 Jens Petersen <petersen at redhat.com> - 1.3.6-1
- improve ghc_fix_dynamic_rpath not to assume cwd = pkg_name
diff --git a/ghc.attr b/ghc.attr
index 9f638d0..1a4f6b7 100644
--- a/ghc.attr
+++ b/ghc.attr
@@ -1,3 +1,3 @@
%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
-%__ghc_path ^%{ghclibdir}/.*/libHS.*\\.(so|a)
+%__ghc_path ^%{ghclibdir}/.*/libHS.*\\.(so|a) || ^%{_bindir}/.*
More information about the scm-commits
mailing list