rpms/ghc-rpm-macros
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

touch %{basepkg}.files so that %files -f works for meta packages

Browse Source
This commit is contained in:
Jens Petersen 2015-01-31 18:14:30 +00:00
parent c13aaea995
commit 9460154623
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-rpm-macros.spec
View File

@ -101,7 +101,9 @@ EOF
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1
- disable Cabal tests on armv7 since they give an internal error - disable Cabal tests on armv7 since they give an internal error
https://ghc.haskell.org/trac/ghc/ticket/10029 https://ghc.haskell.org/trac/ghc/ticket/10029
- fix building of meta packages:
- only run cabal haddock for real libraries with modules - 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 <petersen@redhat.com> - 1.4.5-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.5-1
- fix the R*PATH regexp - fix the R*PATH regexp

1
macros.ghc
View File

@ -55,6 +55,7 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
%define pkgdir %{ghclibdir}/%{pkgnamever}\ %define pkgdir %{ghclibdir}/%{pkgnamever}\
%define docdir %{ghclibdocdir}/%{pkgnamever}\ %define docdir %{ghclibdocdir}/%{pkgnamever}\
rm -f %{basepkg}.files %{basepkg}-devel.files\ rm -f %{basepkg}.files %{basepkg}-devel.files\
touch %{basepkg}.files %{basepkg}-devel.files\
if [ -d "%{buildroot}%{pkgdir}" ]; then\ if [ -d "%{buildroot}%{pkgdir}" ]; then\
echo "%dir %{pkgdir}" >> %{basepkg}.files\ echo "%dir %{pkgdir}" >> %{basepkg}.files\
%if %{undefined ghc_without_shared}\ %if %{undefined ghc_without_shared}\