Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2015-04-15 16:24:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-28 18:38:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2015-04-15 16:24:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 14 07:10:18 UTC 2015 - [email protected] + +- regenerated sle-sp1-rpmdeps.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.VW1IPe/_old 2015-04-15 16:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.VW1IPe/_new 2015-04-15 16:24:40.000000000 +0200 @@ -90,7 +90,7 @@ %patch5 -p1 %patch8 -p1 %if 0%{?sles_version} -%patch -P 100 -p1 +%patch -P 100 -p2 %endif %build ++++++ sle-sp1-rpmdeps.patch ++++++ --- /var/tmp/diff_new_pack.VW1IPe/_old 2015-04-15 16:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.VW1IPe/_new 2015-04-15 16:24:40.000000000 +0200 @@ -1,8 +1,8 @@ -Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh -=================================================================== ---- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-deps.sh -+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh -@@ -25,8 +25,8 @@ else +diff --git b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/ghc-deps.sh a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh +index e3a681e..300315b 100755 +--- b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/ghc-deps.sh ++++ a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh +@@ -30,8 +30,8 @@ else fi case $MODE in @@ -13,23 +13,17 @@ *) echo "`basename $0`: Need --provides or --requires" ; exit 1 esac -@@ -81,4 +81,4 @@ for i in $files; do - fi - done - --echo $files | tr [:blank:] '\n' | /usr/lib/rpm/rpmdeps $MODE -+echo $files | tr [:blank:] '\n' | /usr/lib/rpm/find$FINDMODE -Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc -=================================================================== ---- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc -+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc -@@ -121,6 +121,9 @@ if [ -d "%{buildroot}%{_bindir}" ]; then - find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\ - fi +diff --git b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +index 7bf522c..eda73be 100644 +--- b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +@@ -127,6 +127,9 @@ fi\ + find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ + %endif +# SLE does not define _rpmconfigdir (yet) +%_rpmconfigdir %{_prefix}/lib/rpm + # install bin package %ghc_bin_install()\ - %global _use_internal_dependency_generator 0\ + %cabal_install\
