From 246bc7cfc7a221fc9161448d2ce69c72b0d78f32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Dec 2009 01:00:13 +0000 Subject: [PATCH] backport %ghc_pkg_ver for generating ghc pkg requires version deps --- ghc-rpm-macros.ghc | 2 ++ ghc-rpm-macros.spec | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 08a179e..8b37b8d 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -36,3 +36,5 @@ echo '%{ghcdocdir}' >> %1-doc.files \ %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || : %ghc_version %(ghc --numeric-version) + +%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//") diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index dad98a7..061cbb4 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.2 +Version: 0.2.5 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -48,6 +48,27 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 16 2009 Jens Petersen - 0.2.5-1 +- make ghc_pkg_ver only return pkg version + +* Mon Nov 16 2009 Jens Petersen - 0.2.4-1 +- change GHCRequires to ghc_pkg_ver + +* Mon Nov 16 2009 Jens Petersen - 0.2.3-1 +- use the latest installed pkg version for %%GHCRequires + +* Mon Nov 16 2009 Jens Petersen - 0.2.2-1 +- add %%GHCRequires for automatically versioned library deps + +* Tue Sep 22 2009 Jens Petersen - 0.2.1-2 +- no, revert versioned ghcdocdir again! + +* Tue Sep 22 2009 Jens Petersen - 0.2.1-1 +- version ghcdocdir to allow multiple doc versions like ghcpkgdir + +* Fri Jul 24 2009 Fedora Release Engineering - 0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jun 9 2009 Jens Petersen - 0.2-1 - drop version from ghcdocdir since it breaks haddock indexing