forked from pool/ghc-rpm-macros
c43e4d32e9
- update to 1.4.93
- refreshed:
add-group.patch
files-defattr.patch
fix-gen-filelists.patch
fix-library-dir.patch
suse-disable-debug-packages.patch
suse-docdir.patch
- dropped:
version-docdirs.patch
fix-runpath.patch
ldflags.patch
- added:
remove-flags.patch
- fix ghc-pkg path in ghc-deps.sh for ghc-7.10
- local pkgdir macro is redundant
- use utf8 locale for cabal
- add explicit --enable-shared again for arm64
- introduce ghc_pkgdocdir since no _pkgdocdir in RHEL 7 and earlier
- allow overriding ghc- prefix with ghc_name (for ghc784 etc)
- version ghc-pkg in ghc_pkg_recache
- have to turn off hardening in cabal_configure: set _hardened_ldflags to nil
- add cabal_test macro
- only run cabal haddock for real libraries with modules
- make sure basepkg.files is also created for meta packages
- fix the R*PATH regexp
- version ghcpkgdocdir
- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir
- correct cabal-tweak-flag error message for missing flag
- update ghc_gen_filelists to use new keyed library filepaths
OBS-URL: https://build.opensuse.org/request/show/327589
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=49
27 lines
776 B
Diff
27 lines
776 B
Diff
Index: ghc-rpm-macros-1.4.93/macros.ghc
|
|
===================================================================
|
|
--- ghc-rpm-macros-1.4.93.orig/macros.ghc
|
|
+++ ghc-rpm-macros-1.4.93/macros.ghc
|
|
@@ -19,6 +19,9 @@ proceeding, to avoid dependency ABI brea
|
|
%endif\
|
|
fi
|
|
|
|
+# no _pkgdocdir in openSUSE
|
|
+%_pkgdocdir %{_docdir}/%{name}
|
|
+
|
|
# configure
|
|
%cabal_configure\
|
|
%ghc_check_bootstrap\
|
|
@@ -40,9 +43,9 @@ tests
|
|
%ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
|
|
|
# root dir for ghc docs (used by ghc.spec)
|
|
-%ghc_html_dir %{_docdir}/ghc/html
|
|
+%ghc_html_dir %{_datadir}/doc/ghc/html
|
|
# deprecates
|
|
-%ghcdocbasedir %{_docdir}/ghc/html
|
|
+%ghcdocbasedir %{_datadir}/doc/ghc/html
|
|
|
|
# libraries doc dir (internal)
|
|
%ghc_html_libraries_dir %{ghc_html_dir}/libraries
|