From 79a56ff15112c61f4621495ed1b06de56259d1dc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 5 Sep 2014 12:41:51 +0900 Subject: [PATCH] use rpm internal dependency generator with ghc.attr on F22 requires ghc-rpm-macros ghc.attr - currently only in rawhide --- ghc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc.spec b/ghc.spec index 7778771..c95675d 100644 --- a/ghc.spec +++ b/ghc.spec @@ -187,13 +187,16 @@ The package provides a cronjob for re-indexing installed library development documention. %endif +# ghclibdir also needs ghc_version_override for bootstrapping (ghc-deps.sh) %global ghc_version_override %{version} +# currently only F22 ghc-rpm-macros has ghc.attr +%if 0%{?fedora} < 22 # needs ghc_version_override for bootstrapping %global _use_internal_dependency_generator 0 %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} - +%endif %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release} @@ -255,7 +258,6 @@ except the ghc library, which is installed by the toplevel ghc metapackage. # gen_contents_index: use absolute path for haddock %patch1 -p1 -b .orig -# unversion pkgdoc htmldir rm -r libffi-tarballs %ifnarch %{ix86} x86_64 @@ -270,6 +272,7 @@ rm -r libffi-tarballs %patch15 -p1 -b .orig %endif +# unversion pkgdoc htmldir %if 0%{?fedora} >= 21 %patch16 -p1 -b .orig %endif @@ -547,6 +550,7 @@ fi - bootstrap build - provides haskeline, terminfo and xhtml libraries - shared libraries on all archs +- use rpm internal dependency generator with ghc.attr on F22 * Tue Jul 15 2014 Jens Petersen - 7.6.3-25 - configure ARM with VFPv3D16 and without NEON (#995419)