pool/ghc-rpm-macros
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 296151 from home:mimi_vx:branches:devel:languages:haskell

Browse Source 
- 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
This commit is contained in:
Peter Trommler 2015-04-14 15:02:11 +00:00 committed by Git OBS Bridge
parent 75dfcec8c6
commit 1c4ac32ef0
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.changes
View File

@ -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

2
ghc-rpm-macros.spec
View File

@ -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

32
sle-sp1-rpmdeps.patch
View File

@ -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\