Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2015-02-24 13:03:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2014-12-16 14:48:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2015-02-24 13:07:19.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 23 16:38:21 UTC 2015 - peter.trommler@ohm-hochschule.de + +- update to 1.4.7 +- drop fix-runpath.patch + * fixed upstream +- refresh fix-gen-filelists.patch +- refresh suse-disable-debug-packages.patch +- refresh suse-docdir.patch +- add remove-flags.patch + * remove passing of CFLAGS and LDFLAGS to ghc + * no macro %__global_ldflags in openSUSE +- remove provides ghc() workaround + * fixed upstream + +------------------------------------------------------------------- Old: ---- fix-runpath.patch ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.tar.xz New: ---- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz remove-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-rpm-macros # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%global git_hash 2da26f9db56515862de9839f12a17be5f2ed2eb7 +%global git_hash 81726e4857a866d19cc59b496846d127b9e8c381 %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.3.6 +Version: 1.4.7 Release: 0 BuildArch: noarch Summary: RPM Macros for building packages for GHC @@ -43,8 +43,8 @@ Patch4: suse-docdir.patch # PATCH-FIX_UPSTREAM fix-gen-filelists.patch Patch5: fix-gen-filelists.patch -# PATCH-FIX-UPSTREAM fix-runpath.patch peter.trommler@ohm-hochschule.de -- In openSUSE we patch binutils to default to the "new" RUNPATH dynamic tag and not the obsolete RPATH. This patch adds support for the former and still works for the latter. -Patch7: fix-runpath.patch +# PATCH-FIX-OPENSUSE remove-flags.patch peter.trommler@ohm-hochschule.de -- Do not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro %%__global_ldflags. +Patch8: remove-flags.patch # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler@ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2 and SP3 Patch100: sle-sp1-rpmdeps.patch @@ -53,12 +53,6 @@ %if %{undefined without_hscolour} Requires: hscolour %endif -# This is a workaround for a bug in the automatic dependencies generator -# ghc-deps.sh generates this symbol for extra libraries installed with a -# dynamic ghc, currently only %%{ix86} and x86_64 -%ifarch %{ix86} x86_64 -Provides: ghc() -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,7 +88,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 +%patch8 -p1 %if 0%{?sles_version} %patch -P 100 -p1 %endif @@ -106,7 +100,8 @@ install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc install -p -D -m 0644 macros.ghc-extra %{buildroot}/%{macros_dir}/macros.ghc-extra install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh -install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr +install -p -D -m 0644 ghc_bin.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +install -p -D -m 0644 ghc_lib.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag @@ -114,7 +109,8 @@ %defattr(-,root,root,-) %doc COPYING AUTHORS %config %{macros_dir}/macros.ghc -%{_prefix}/lib/rpm/fileattrs/ghc.attr +%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag ++++++ fix-gen-filelists.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,10 +1,10 @@ -Index: ghc-rpm-macros-master/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-master.orig/macros.ghc -+++ ghc-rpm-macros-master/macros.ghc -@@ -48,7 +48,7 @@ fi - %define docdir %{ghclibdocdir}/%{pkgname}\ +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +@@ -66,7 +66,7 @@ tests rm -f %{basepkg}.files %{basepkg}-devel.files\ + touch %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ -echo "%dir %{pkgdir}" >> %{basepkg}.files\ +echo "%%dir %{pkgdir}" >> %{basepkg}.files\ ++++++ ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.tar.xz -> ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/cabal-tweak-flag new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/cabal-tweak-flag --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/cabal-tweak-flag 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/cabal-tweak-flag 2015-02-01 08:56:35.000000000 +0100 @@ -29,7 +29,7 @@ fi if ! grep -q -i "^flag *$FLAG" $CABALFILE; then - echo "$CABALFILE does have flag $FLAG" + echo "$CABALFILE does not have flag $FLAG" exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-deps.sh new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-deps.sh 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh 2015-02-01 08:56:35.000000000 +0100 @@ -1,11 +1,6 @@ #!/bin/sh # find rpm provides and requires for Haskell GHC libraries -# To use add the following lines to spec file: -# %define _use_internal_dependency_generator 0 -# %define __find_requires /usr/lib/rpm/ghc-deps.sh --requires %{buildroot}%{ghclibdir} -# %define __find_provides /usr/lib/rpm/ghc-deps.sh --provides %{buildroot}%{ghclibdir} - [ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] %{buildroot}%{ghclibdir}" && exit 1 set +x @@ -15,11 +10,21 @@ PKGCONFDIR=$PKGBASEDIR/package.conf.d GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) -if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then - # ghc-7.8 - GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" -elif [ -x "$PKGBASEDIR/ghc-pkg" ]; then - GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR" +# for a ghc build use the new ghc-pkg +INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER + +if [ -x "$INPLACE_GHCPKG" ]; then + case $GHC_VER in + 7.8.*) + GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" + ;; + 7.6.*) + GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR" + ;; + *) + GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR" + ;; + esac else GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER}" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-rpm-macros.spec new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-rpm-macros.spec --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-rpm-macros.spec 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-rpm-macros.spec 2015-02-01 08:56:35.000000000 +0100 @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.3.6 +Version: 1.4.8 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -24,10 +24,13 @@ Source4: cabal-tweak-dep-ver Source5: cabal-tweak-flag Source6: macros.ghc-extra -Source7: ghc.attr +Source7: ghc_bin.attr +Source8: ghc_lib.attr Requires: ghc-srpm-macros # macros.ghc-srpm moved out from redhat-rpm-config-21 Requires: redhat-rpm-config > 20-1.fc21 +# for ghc_version +Requires: ghc-compiler %if %{undefined without_hscolour} %ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x ppc64le aarch64 Requires: hscolour @@ -63,26 +66,18 @@ install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh -install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr +install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +install -p -D -m 0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag -# turn off shared libs and dynamic linking on secondary archs -%ifnarch %{ix86} x86_64 -cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF - -# shared libraries are only supported on primary intel archs -%%ghc_without_dynamic 1 -%%ghc_without_shared 1 -EOF -%endif - %files %doc COPYING AUTHORS %{macros_dir}/macros.ghc -%{_prefix}/lib/rpm/fileattrs/ghc.attr +%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag @@ -93,6 +88,56 @@ %changelog +* Sun Feb 1 2015 Jens Petersen <petersen@redhat.com> - 1.4.8-1 +- drop cabal_tests_not_working since not all tests failing on ARMv7 + +* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.7-1 +- fix arch for cabal_tests_not_working +- add cabal_test macro which uses it + +* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 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 <petersen@redhat.com> - 1.4.5-1 +- fix the R*PATH regexp + +* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.4-1 +- ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH + +* Thu Jan 22 2015 Jens Petersen <petersen@redhat.com> - 1.4.3-1 +- version ghcpkgdocdir +- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir + +* Thu Jan 22 2015 Jens Petersen <petersen@redhat.com> - 1.4.2-1 +- correct cabal-tweak-flag error message for missing flag (#1184508) + +* Sat Jan 17 2015 Jens Petersen <petersen@redhat.com> - 1.4.1-1 +- revert to versioned doc htmldirs + +* Sat Jan 17 2015 Jens Petersen <petersen@redhat.com> - 1.4.0-1 +- enable shared libraries and dynamic linking on all arch's + since ghc-7.8 now supports that +- disable debuginfo until ghc-7.10 which will support dwarf debugging output + (#1138982) + +* Fri Nov 14 2014 Jens Petersen <petersen@redhat.com> - 1.3.10-1 +- split ghc.attr into ghc_lib.attr and ghc_bin.attr for finer grained handling +- require ghc-compiler for ghc_version + +* Mon Oct 27 2014 Jens Petersen <petersen@redhat.com> - 1.3.9-1 +- macros.ghc: cabal_configure now passes CFLAGS and LDFLAGS to ghc (#1138982) + (thanks to Sergei Trofimovich and Ville Skyttä) + +* Thu Oct 23 2014 Jens Petersen <petersen@redhat.com> - 1.3.8-1 +- ghc-deps.sh: support ghc-pkg for ghc builds <= 7.4.2 as well + +* Thu Oct 16 2014 Jens Petersen <petersen@redhat.com> - 1.3.7-1 +- ghc.attr needs to handle requires for /usr/bin files too + * Wed Sep 10 2014 Jens Petersen <petersen@redhat.com> - 1.3.6-1 - improve ghc_fix_dynamic_rpath not to assume cwd = pkg_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc.attr 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc.attr 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} -%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} -%__ghc_path ^%{ghclibdir}/.*/libHS.*\\.(so|a) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_bin.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_bin.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_bin.attr 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_bin.attr 2015-02-01 08:56:35.000000000 +0100 @@ -0,0 +1,3 @@ +%__ghc_bin_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} +%__ghc_bin_magic executable, .* dynamically linked +%__ghc_bin_flags exeonly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_lib.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_lib.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_lib.attr 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_lib.attr 2015-02-01 08:56:35.000000000 +0100 @@ -0,0 +1,3 @@ +%__ghc_lib_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} +%__ghc_lib_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} +%__ghc_lib_path ^%{ghclibdir}/.*/libHS.*\\.(so|a)$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc 2015-02-01 08:56:35.000000000 +0100 @@ -21,17 +21,34 @@ # configure %cabal_configure\ %ghc_check_bootstrap\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options +CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ +LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v -# root dir for ghc docs +tests +%cabal_test\ +%if %{with tests}\ +%cabal test\ +%endif + +# root dir for ghc docs (used by ghc.spec) +%ghc_html_dir %{_docdir}/ghc/html +# deprecates %ghcdocbasedir %{_docdir}/ghc/html -# libraries doc dir + +# libraries doc dir (internal) +%ghc_html_libraries_dir %{ghc_html_dir}/libraries +# deprecates %ghclibdocdir %{ghcdocbasedir}/libraries + # pkg doc dir -%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name} +%ghc_html_pkg_dir %{ghc_html_libraries_dir}/%{pkg_name}-%{version} +# deprecates +%ghcpkgdocdir %{ghclibdocdir}/%{pkg_name}-%{version} + # top library dir %ghclibdir %{_libdir}/ghc-%{ghc_version} @@ -42,8 +59,9 @@ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg ghc-%{pkgname}\ %define pkgdir %{ghclibdir}/%{pkgnamever}\ -%define docdir %{ghclibdocdir}/%{pkgname}\ +%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}\ @@ -80,12 +98,14 @@ # ghc_bin_build %ghc_bin_build\ +%global debug_package %{nil}\ %cabal_configure\ %cabal build # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ -%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%global debug_package %{nil}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil} @@ -93,7 +113,11 @@ %ghc_lib_build()\ %ghc_lib_build_without_haddock\ %if %{undefined without_haddock}\ +%define pkgname %{?1}%{!?1:%{pkg_name}}\ +%define pkgver %{?2}%{!?2:%{version}}\ +if [ -f dist/build/libHS%{pkgname}-%{pkgver}.a ]; then\ %cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\ +fi\ %endif\ %{nil} @@ -123,9 +147,12 @@ if ! type chrpath > /dev/null; then exit 1; fi\ PDIR=$(pwd)\ for i in %*; do\ - PROG=%{buildroot}%{_bindir}/$i\ + case $i in\ + /*) PROG=%{buildroot}$i ;;\ + *) PROG=%{buildroot}%{_bindir}/$i ;;\ + esac\ if [ -x "$PROG" ]; then\ - RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RPATH=@@")\ + RPATH=$(chrpath $PROG | sed -e "s@^$PROG: R.*PATH=@@")\ case $RPATH in\ *$PDIR*)\ NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\ ++++++ remove-flags.patch ++++++ Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== --- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc +++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc @@ -24,9 +24,7 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ -CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ -LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v ++++++ suse-disable-debug-packages.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,8 +1,8 @@ -Index: ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.orig/macros.ghc -+++ ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc -@@ -150,3 +150,13 @@ done\ +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +@@ -177,3 +177,13 @@ done\ %global without_prof 1\ %global without_haddock 1\ %global without_manual 1 ++++++ suse-docdir.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,7 +1,7 @@ -Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/macros.ghc -+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/macros.ghc +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc @@ -18,6 +18,9 @@ proceeding, to avoid dependency ABI brea %endif\ fi @@ -12,12 +12,15 @@ # configure %cabal_configure\ %ghc_check_bootstrap\ -@@ -27,7 +30,7 @@ fi - %cabal_install %cabal copy --destdir=%{buildroot} -v +@@ -35,9 +38,9 @@ tests + %endif - # root dir for ghc docs + # 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 - %ghclibdocdir %{ghcdocbasedir}/libraries - # pkg doc dir + + # libraries doc dir (internal) + %ghc_html_libraries_dir %{ghc_html_dir}/libraries -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org