Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2016-03-01 09:43:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-18 22:34:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2016-03-01 09:43:54.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 18 14:55:41 UTC 2016 - [email protected] + +- update to 1.5.0 +- update for ghc-8.0 +- ghc-deps uses --provides and --requires again + +------------------------------------------------------------------- Old: ---- ghc-rpm-macros-1.4.98.tar.bz2 New: ---- ghc-rpm-macros-1.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.NmsybO/_old 2016-03-01 09:43:57.000000000 +0100 +++ /var/tmp/diff_new_pack.NmsybO/_new 2016-03-01 09:43:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-rpm-macros # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.4.98 +Version: 1.5.0 Release: 0 BuildArch: noarch Summary: RPM Macros for building packages for GHC ++++++ ghc-rpm-macros-1.4.98.tar.bz2 -> ghc-rpm-macros-1.5.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/README new/ghc-rpm-macros-1.5.0/README --- old/ghc-rpm-macros-1.4.98/README 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-1.5.0/README 2016-02-18 15:43:34.000000000 +0100 @@ -0,0 +1,2 @@ +This repo is for openSUSE and SUSE fork of fedora-haskell/ghc-rpm-macros used for +build openSUSE and SUSE haskell packages in https://build.opensuse.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc-deps.sh new/ghc-rpm-macros-1.5.0/ghc-deps.sh --- old/ghc-rpm-macros-1.4.98/ghc-deps.sh 2015-11-11 09:04:24.000000000 +0100 +++ new/ghc-rpm-macros-1.5.0/ghc-deps.sh 2016-02-08 08:59:32.000000000 +0100 @@ -1,13 +1,20 @@ #!/bin/sh -# find rpm requires for Haskell GHC libraries +# find rpm provides and requires for Haskell GHC libraries -[ $# -ne 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir}" && exit 1 +[ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] %{buildroot}%{ghclibdir}" && exit 1 set +x -PKGBASEDIR=$1 +MODE=$1 +PKGBASEDIR=$2 PKGCONFDIR=$PKGBASEDIR/package.conf.d +case $MODE in + --provides) FIELD=id ;; + --requires) FIELD=depends ;; + *) echo "`basename $0`: Need --provides or --requires" ; exit 1 +esac + files=$(cat) for i in $files; do @@ -15,10 +22,10 @@ # exclude builtin_rts.conf $PKGCONFDIR/*-*.conf) PKGVER=$(echo $i | sed -e "s%$PKGCONFDIR/\(.\+\)-.\+.conf%\1%") - DEPS=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER depends | sed -e "s/^depends: \+//" -e "s/builtin_rts//" -e "s/\(bin-package-db\|ghc-prim\|integer-gmp\)-[^ ]\+//") - for d in $DEPS; do + OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD | sed -e "s/^depends: \+//" -e "s/rts//" -e "s/\(bin-package-db\|ghc-prim\|integer-gmp\)-[^ ]\+//") + for d in $OUT; do case $d in - *-*) echo "$d" | sed -e "s%\(.\+\)-\(.\+\)-.\+%ghc-\1-devel = \2%" ;; + *-*) echo "ghc-devel($d)" ;; *) ;; esac done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc-pkg-wrapper new/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper --- old/ghc-rpm-macros-1.4.98/ghc-pkg-wrapper 2015-11-11 09:01:07.000000000 +0100 +++ new/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper 2016-02-08 08:59:32.000000000 +0100 @@ -22,7 +22,7 @@ ;; # 7.8 and 7.10 *) - GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" + GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global --global-package-db=$PKGCONFDIR" ;; esac else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc.attr new/ghc-rpm-macros-1.5.0/ghc.attr --- old/ghc-rpm-macros-1.4.98/ghc.attr 2015-11-11 09:01:07.000000000 +0100 +++ new/ghc-rpm-macros-1.5.0/ghc.attr 2016-02-08 08:59:32.000000000 +0100 @@ -1,2 +1,3 @@ -%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir} +%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} +%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} %__ghc_path ^%{ghclibdir}/package.conf.d/.*\.conf$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/macros.ghc new/ghc-rpm-macros-1.5.0/macros.ghc --- old/ghc-rpm-macros-1.4.98/macros.ghc 2015-11-15 23:09:46.000000000 +0100 +++ new/ghc-rpm-macros-1.5.0/macros.ghc 2016-02-18 15:43:34.000000000 +0100 @@ -65,7 +65,7 @@ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\ %define docdir %{ghclibdocdir}/%{pkgnamever}\ -keyname=$(/usr/lib/rpm/ghc-pkg-wrapper %{buildroot}%{ghclibdir} field %{pkgname} key | sed -e "s/key: //")\ +keyname=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} field %{pkgname} key | sed -e "s/key: //")\ pkgdir="%{ghclibdir}/${keyname}"\ rm -f %{basepkg}.files %{basepkg}-devel.files\ touch %{basepkg}.files %{basepkg}-devel.files\ @@ -134,12 +134,17 @@ # install bin package %ghc_bin_install()\ +%{!?_fileattrsdir:%global _use_internal_dependency_generator 0}\ +%{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\ %cabal_install\ %{!?1:%ghc_strip_dynlinked}\ %{nil} # ghc_lib_install [name] [version] %ghc_lib_install()\ +%{!?_fileattrsdir:%global _use_internal_dependency_generator 0}\ +%{!?_fileattrsdir:%global __find_provides %{_rpmconfigdir}/rpmdeps --provides}\ +%{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\ %cabal_install\ %cabal_pkg_conf\ %ghc_gen_filelists\
