57d9e0e1d2
Fix rpmdeps issue for SLE-11-SP1 OBS-URL: https://build.opensuse.org/request/show/107156 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=4
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
diff -Nur 0.15.4/ghc-deps.sh 0.15.4.sle11-sp1/ghc-deps.sh
|
|
--- 0.15.4/ghc-deps.sh 2012-02-19 16:02:03.000000000 +0100
|
|
+++ 0.15.4.sle11-sp1/ghc-deps.sh 2012-02-19 16:05:14.000000000 +0100
|
|
@@ -20,8 +20,8 @@
|
|
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
|
|
|
|
@@ -92,4 +92,4 @@
|
|
fi
|
|
done
|
|
|
|
-echo $files | tr [:blank:] '\n' | /usr/lib/rpm/rpmdeps $MODE
|
|
+echo $files | tr [:blank:] '\n' | /usr/lib/rpm/find$FINDMODE
|
|
diff -Nur 0.15.4/ghc-rpm-macros.ghc 0.15.4.sle11-sp1/ghc-rpm-macros.ghc
|
|
--- 0.15.4/ghc-rpm-macros.ghc 2012-02-19 15:57:19.000000000 +0100
|
|
+++ 0.15.4.sle11-sp1/ghc-rpm-macros.ghc 2012-02-23 08:35:48.000000000 +0100
|
|
@@ -254,6 +254,9 @@
|
|
%{?1:cd -}\
|
|
%{nil}
|
|
|
|
+# SLE does not define _rpmconfigdir (yet)
|
|
+%_rpmconfigdir %{_prefix}/lib/rpm
|
|
+
|
|
# install bin package
|
|
%ghc_bin_install\
|
|
%if %{undefined ghc_bootstrapping}\
|