diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 3e07824..a6b4f3a 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.6.3 +Version: 2.6.4 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -185,6 +185,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Thu Nov 9 2023 Jens Petersen - 2.6.4-1 +- fix my flatpak comments + * Mon Oct 30 2023 Yaakov Selkowitz - 2.6.3-1 - Fix flatpak builds diff --git a/macros.ghc b/macros.ghc index a43c4e4..71e2434 100644 --- a/macros.ghc +++ b/macros.ghc @@ -95,14 +95,14 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %cabal_configure\ %ghc_set_gcc_flags\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ -# datadir hardcoded for flatpaks +# datadir hardcoded for flatpaks\ cp /usr/share/ghc-rpm-macros/Setup.hs .\ fi\ if [ -d "%{ghclibdir}/lib" ]; then\ subsubdir=/lib\ fi\ %cabal --version\ -# bindir hardcoded for flatpaks +# bindir hardcoded for flatpaks\ %cabal configure %{!-W:%{?ghc_name:--with-compiler=/usr/bin/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?flatpak:--extra-lib-dirs=%{_libdir}} %{?cabal_configure_options} $cabal_configure_extra_options # install