From 1c4ac32ef0d45849e8a629ea299e2d61eb25a85bb9d92c056c94e14ed0f3af29 Mon Sep 17 00:00:00 2001
From: Peter Trommler <ptrommler@icloud.com>
Date: Tue, 14 Apr 2015 15:02:11 +0000
Subject: [PATCH] Accepting request 296151 from
 home:mimi_vx:branches:devel:languages:haskell

- regenerated sle-sp1-rpmdeps.patch

OBS-URL: https://build.opensuse.org/request/show/296151
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=44
---
 ghc-rpm-macros.changes |  5 +++++
 ghc-rpm-macros.spec    |  2 +-
 sle-sp1-rpmdeps.patch  | 32 +++++++++++++-------------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes
index 273aabf..cd23d09 100644
--- a/ghc-rpm-macros.changes
+++ b/ghc-rpm-macros.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 14 07:10:18 UTC 2015 - mimi.vx@gmail.com
+
+- regenerated sle-sp1-rpmdeps.patch 
+
 -------------------------------------------------------------------
 Fri Mar 27 08:17:55 UTC 2015 - peter.trommler@ohm-hochschule.de
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 7338dc4..f05be83 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -90,7 +90,7 @@ Macros used when generating source Haskell rpm packages.
 %patch5 -p1
 %patch8 -p1
 %if 0%{?sles_version}
-%patch -P 100 -p1
+%patch -P 100 -p2
 %endif
 
 %build
diff --git a/sle-sp1-rpmdeps.patch b/sle-sp1-rpmdeps.patch
index 80993fd..a8f96f3 100644
--- a/sle-sp1-rpmdeps.patch
+++ b/sle-sp1-rpmdeps.patch
@@ -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 @@ Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh
      *) 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\