Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2017-07-24 12:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Mon Jul 24 12:33:13 2017 rev:33 rq:511989 version:1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2017-05-31 12:20:00.534141415 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2017-07-24 12:33:17.074217980 +0200 @@ -1,0 +2,7 @@ +Fri Jul 14 14:23:54 UTC 2017 - [email protected] + +- update to 1.7.2 +- disabled smp build -- it brokes reproduciblity of haskell packages + * reported by [email protected] + +------------------------------------------------------------------- Old: ---- ghc-rpm-macros-1.7.1.tar.xz New: ---- ghc-rpm-macros-1.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.hy9CdM/_old 2017-07-24 12:33:17.654136118 +0200 +++ /var/tmp/diff_new_pack.hy9CdM/_new 2017-07-24 12:33:17.658135553 +0200 @@ -19,13 +19,13 @@ %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0+ Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG -# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros +# source gets updated with osc service dr Source0: %{name}-%{version}.tar.xz BuildRequires: xz Requires: rpm ++++++ ghc-rpm-macros-1.7.1.tar.xz -> ghc-rpm-macros-1.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.7.1/macros.ghc new/ghc-rpm-macros-1.7.2/macros.ghc --- old/ghc-rpm-macros-1.7.1/macros.ghc 2017-05-28 12:19:32.878046958 +0200 +++ new/ghc-rpm-macros-1.7.2/macros.ghc 2017-07-12 12:08:02.187853889 +0200 @@ -67,6 +67,8 @@ %Cabal_version %(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//") +%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir} + # ghc_gen_filelists [name] [version] %ghc_gen_filelists()\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ @@ -91,7 +93,7 @@ echo "%{docdir}" >> %{basepkg}-devel.files\ fi\ %if 0%{?1:1}\ -for i in $(ls %{buildroot}%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/%{!?1:%{name}}%{?1:%{basepkg}}); do\ +for i in $(ls %{buildroot}%{_ghclicensedir}/%{!?1:%{name}}%{?1:%{basepkg}}); do\ echo "%%license %{?1:%{pkgnamever}/}$i" >> %{basepkg}.files\ done\ %endif\ @@ -115,13 +117,13 @@ # ghc_bin_build %ghc_bin_build\ %cabal_configure\ -%cabal build %{_smp_mflags} %{?cabal_build_options} +%cabal build %{?ghc_smp_mflags} %{?cabal_build_options} # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %global debug_package %{nil}\ -%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ -%cabal build %{_smp_mflags} %{?cabal_build_options}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%cabal build %{?ghc_smp_mflags} %{?cabal_build_options}\ %{nil} # ghc_lib_build [name] [version]
