forked from pool/ghc-rpm-macros
aed9181e3d
ghc-deps does not emit ghc-* = version depends anymore. OBS-URL: https://build.opensuse.org/request/show/112972 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=5
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
diff -Nur 0.15.5-obs/ghc-deps.sh 0.15.5-sle/ghc-deps.sh
|
|
--- 0.15.5-obs/ghc-deps.sh 2012-03-19 17:03:57.000000000 +0100
|
|
+++ 0.15.5-sle/ghc-deps.sh 2012-03-19 17:05:16.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
|
|
|
|
@@ -78,4 +78,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.5-obs/ghc-rpm-macros.ghc 0.15.5-sle/ghc-rpm-macros.ghc
|
|
--- 0.15.5-obs/ghc-rpm-macros.ghc 2012-03-19 16:58:43.000000000 +0100
|
|
+++ 0.15.5-sle/ghc-rpm-macros.ghc 2012-03-19 17:05:16.000000000 +0100
|
|
@@ -257,6 +257,9 @@
|
|
%{?1:cd -}\
|
|
%{nil}
|
|
|
|
+# SLE does not define _rpmconfigdir (yet)
|
|
+%_rpmconfigdir %{_prefix}/lib/rpm
|
|
+
|
|
# install bin package
|
|
%ghc_bin_install\
|
|
%if %{undefined ghc_bootstrapping}\
|