Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2017-05-31 12:19:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Wed May 31 12:19:07 2017 rev:32 rq:498959 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2017-02-28 23:50:54.330427913 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2017-05-31 12:20:00.534141415 +0200 @@ -1,0 +2,6 @@ +Mon May 29 06:43:58 UTC 2017 - [email protected] + +- update to 1.7.1 +- sync with upstream + +------------------------------------------------------------------- Old: ---- ghc-rpm-macros-1.6.95.tar.xz New: ---- ghc-rpm-macros-1.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.iNVWaD/_old 2017-05-31 12:20:01.398019466 +0200 +++ /var/tmp/diff_new_pack.iNVWaD/_new 2017-05-31 12:20:01.402018901 +0200 @@ -18,28 +18,23 @@ %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 - Name: ghc-rpm-macros -Version: 1.6.95 +Version: 1.7.1 Release: 0 -BuildArch: noarch 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 Source0: %{name}-%{version}.tar.xz - BuildRequires: xz Requires: rpm +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if %{undefined without_hscolour} Requires: hscolour %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description A set of macros for building GHC packages following the openSUSE Haskell Guidelines. ghc needs to be installed in @@ -63,7 +58,7 @@ Macros used when generating source Haskell rpm packages. %prep -%setup -q -n %{name}-%{version} +%setup -q %build echo no build stage needed @@ -74,6 +69,7 @@ install -p -D -m 0644 macros.ghc-suse %{buildroot}/%{macros_dir}/macros.ghc-suse install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver +install -p -D -m 0755 cabal-tweak-drop-dep %{buildroot}/%{_bindir}/cabal-tweak-drop-dep install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag install -p -D -m 0755 ghc-pkg-wrapper %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr @@ -87,6 +83,7 @@ %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag +%{_bindir}/cabal-tweak-drop-dep %{_prefix}/lib/rpm/ghc-pkg-wrapper %{_prefix}/lib/rpm/fileattrs/ghc.attr %{_prefix}/lib/rpm/ghc-dirs.sh ++++++ ghc-rpm-macros-1.6.95.tar.xz -> ghc-rpm-macros-1.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/README new/ghc-rpm-macros-1.7.1/README --- old/ghc-rpm-macros-1.6.95/README 2016-12-19 09:57:45.000000000 +0100 +++ new/ghc-rpm-macros-1.7.1/README 2017-05-28 12:18:49.801151295 +0200 @@ -1,4 +1,7 @@ -This repo is used for latest rpm packaging of ghc and Haskell packages. +This repo is used for the latest development rpm packaging of ghc and +Haskell packages. -It is used for experimental packaging for new versions of ghc -and as upstream to Fedora and OpenSUSE Haskell packaging. +It is used for packaging for new versions of ghc +and as an upstream for Fedora and OpenSUSE Haskell packaging. + +The aim now is to make it work across multiple ghc versions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/cabal-tweak-drop-dep new/ghc-rpm-macros-1.7.1/cabal-tweak-drop-dep --- old/ghc-rpm-macros-1.6.95/cabal-tweak-drop-dep 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-1.7.1/cabal-tweak-drop-dep 2017-05-28 12:16:53.830745496 +0200 @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e +x + +USAGE="Usage: $0 dep" + +if [ $# -ne 1 ]; then + echo "$USAGE" + exit 1 +fi + +DEP=$1 + +CABALFILE=$(ls *.cabal) + +if [ $(echo $CABALFILE | wc -w) -ne 1 ]; then + echo "There needs to be one .cabal file in the current dir!" + exit 1 +fi + +if [ ! -f $CABALFILE.orig ]; then + BACKUP=.orig +fi + +if grep $DEP $CABALFILE | sed -e "s/$DEP//" | grep -q -e "[A-Za-z]"; then + echo "$0: deleting whole $DEP lines not safe - try more precise pattern" + exit 1 +fi + +sed -i$BACKUP -e "/$DEP/d" $CABALFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/ghc-deps.sh new/ghc-rpm-macros-1.7.1/ghc-deps.sh --- old/ghc-rpm-macros-1.6.95/ghc-deps.sh 2017-01-20 09:22:10.000000000 +0100 +++ new/ghc-rpm-macros-1.7.1/ghc-deps.sh 2017-05-28 12:16:53.830745496 +0200 @@ -19,7 +19,7 @@ files=$(cat) -cabal_ver=$(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//") +#cabal_ver=$(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//") for i in $files; do case $i in @@ -32,7 +32,7 @@ case $d in *-*) echo "ghc-devel($d)" ;; *) ;; - esac + esac done ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/macros.ghc new/ghc-rpm-macros-1.7.1/macros.ghc --- old/ghc-rpm-macros-1.6.95/macros.ghc 2017-01-20 09:52:45.000000000 +0100 +++ new/ghc-rpm-macros-1.7.1/macros.ghc 2017-05-28 12:19:32.878046958 +0200 @@ -6,6 +6,9 @@ LANG=en_US.utf8\ ./Setup +# compiler version +%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} + # check ghc version was rebuilt against self %ghc_check_bootstrap\ if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; then\ @@ -62,9 +65,6 @@ %_ghcpkglibdir %(%{_rpmconfigdir}/ghc-dirs.sh %{_libdir} %{pkg_name}-%{version} pkglibdir) -# compiler version -%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} - %Cabal_version %(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//") # ghc_gen_filelists [name] [version] @@ -90,9 +90,11 @@ if [ -d "%{buildroot}%{docdir}" ]; then\ echo "%{docdir}" >> %{basepkg}-devel.files\ fi\ +%if 0%{?1:1}\ for i in $(ls %{buildroot}%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/%{!?1:%{name}}%{?1:%{basepkg}}); do\ echo "%%license %{?1:%{pkgnamever}/}$i" >> %{basepkg}.files\ done\ +%endif\ for i in %{basepkg}.files %{basepkg}-devel.files; do\ if [ -f "$i" ]; then\ sed -i -e "s!%{buildroot}!!g" $i\ @@ -118,7 +120,7 @@ # 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} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%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}\ %{nil} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/macros.ghc-extra new/ghc-rpm-macros-1.7.1/macros.ghc-extra --- old/ghc-rpm-macros-1.6.95/macros.ghc-extra 2017-01-20 09:22:10.000000000 +0100 +++ new/ghc-rpm-macros-1.7.1/macros.ghc-extra 2017-05-28 12:16:53.830745496 +0200 @@ -1,8 +1,8 @@ # RPM Macros for packaging Haskell packages with multiple libs -*-rpm-spec-*- -# ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name-version] +# ghc_lib_subpackage [-c cdepslist] [-d] [-l licensetag] [-x] [name-version] # for backward compat also support: ghc_lib_subpackage name version -%ghc_lib_subpackage(c:l:x)\ +%ghc_lib_subpackage(c:dl:x)\ %define pkgname %{?2:%{1}}%{!?2:%{lua:\ local pv = rpm.expand("%1")\ local _, _, name = string.find(pv, "^([%a-]+)-")\ @@ -51,13 +51,13 @@ %postun -n %{basepkg}-devel\ %ghc_pkg_recache\ \ -%files -n %{basepkg} -f %{basepkg}.files\ +%files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\ %if 0%{?rhel} && 0%{?rhel} < 7\ %defattr(-,root,root,-)\ %endif\ %{?base_doc_files:%doc %base_doc_files}\ \ -%files -n %{basepkg}-devel -f %{basepkg}-devel.files\ +%files -n %{basepkg}-devel -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-devel.files\ %if 0%{?rhel} && 0%{?rhel} < 7\ %defattr(-,root,root,-)\ %endif\ @@ -67,7 +67,7 @@ # ghc_libs_build [name-version] ... %ghc_libs_build()\ HOME=$PWD\ -%define cabal_configure_options --user\ +%global ghc_subpackaging 1\ for i in %*; do\ name=$(echo $i | sed -e "s/\\(.*\\)-.*/\\1/")\ ver=$(echo $i | sed -e "s/.*-\\(.*\\)/\\1/")\ @@ -94,7 +94,6 @@ name=$(echo $i | sed -e "s/\\(.*\\)-.*/\\1/")\ ver=$(echo $i | sed -e "s/.*-\\(.*\\)/\\1/")\ %ghc_lib_install $name $ver\ -mv *.files ..\ cd ..\ done\ %ghc_fix_rpath $args\
