ec03c230db
Haskell Platform update OBS-URL: https://build.opensuse.org/request/show/123719 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=6
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
diff -Nur 0.90-suse-packaging/ghc-deps.sh 0.90-sle-rpmdeps/ghc-deps.sh
|
|
--- 0.90-suse-packaging/ghc-deps.sh 2012-04-26 16:08:59.000000000 +0200
|
|
+++ 0.90-sle-rpmdeps/ghc-deps.sh 2012-04-26 16:16:10.000000000 +0200
|
|
@@ -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
|
|
|
|
@@ -77,4 +77,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.90-suse-packaging/ghc-rpm-macros.ghc 0.90-sle-rpmdeps/ghc-rpm-macros.ghc
|
|
--- 0.90-suse-packaging/ghc-rpm-macros.ghc 2012-04-26 16:10:36.000000000 +0200
|
|
+++ 0.90-sle-rpmdeps/ghc-rpm-macros.ghc 2012-04-26 16:16:10.000000000 +0200
|
|
@@ -256,6 +256,9 @@
|
|
%{?1:cd -}\
|
|
%{nil}
|
|
|
|
+# SLE does not define _rpmconfigdir (yet)
|
|
+%_rpmconfigdir %{_prefix}/lib/rpm
|
|
+
|
|
# install bin package
|
|
%ghc_bin_install\
|
|
%if %{undefined ghc_bootstrapping}\
|