From 9460154623a4b2b5b94392f0714f9b9d1078520c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 31 Jan 2015 18:14:30 +0000 Subject: [PATCH] touch %{basepkg}.files so that %files -f works for meta packages --- ghc-rpm-macros.spec | 2 ++ macros.ghc | 1 + 2 files changed, 3 insertions(+) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 427d38c..896f633 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -101,7 +101,9 @@ EOF * Sat Jan 31 2015 Jens Petersen - 1.4.6-1 - disable Cabal tests on armv7 since they give an internal error https://ghc.haskell.org/trac/ghc/ticket/10029 +- fix building of meta packages: - only run cabal haddock for real libraries with modules +- make sure basepkg.files is also created for meta packages * Sat Jan 31 2015 Jens Petersen - 1.4.5-1 - fix the R*PATH regexp diff --git a/macros.ghc b/macros.ghc index 1936274..5f7668b 100644 --- a/macros.ghc +++ b/macros.ghc @@ -55,6 +55,7 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ %define pkgdir %{ghclibdir}/%{pkgnamever}\ %define docdir %{ghclibdocdir}/%{pkgnamever}\ rm -f %{basepkg}.files %{basepkg}-devel.files\ +touch %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ echo "%dir %{pkgdir}" >> %{basepkg}.files\ %if %{undefined ghc_without_shared}\