456cadc55a
Update to version 1.2 OBS-URL: https://build.opensuse.org/request/show/210906 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=22
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
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
|
|
fi
|
|
|
|
case $MODE in
|
|
- --provides) FIELD=id ;;
|
|
- --requires) FIELD=depends ;;
|
|
+ --provides) FIELD=id FINDMODE=-provides ;;
|
|
+ --requires) FIELD=depends FINDMODE=-requires ;;
|
|
*) 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
|
|
|
|
+# SLE does not define _rpmconfigdir (yet)
|
|
+%_rpmconfigdir %{_prefix}/lib/rpm
|
|
+
|
|
# install bin package
|
|
%ghc_bin_install()\
|
|
%global _use_internal_dependency_generator 0\
|