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
103 lines
4.8 KiB
Diff
103 lines
4.8 KiB
Diff
diff -Nur 0.90/ghc-deps.sh 0.90-suse-packaging/ghc-deps.sh
|
|
--- 0.90/ghc-deps.sh 2012-04-23 17:36:55.000000000 +0200
|
|
+++ 0.90-suse-packaging/ghc-deps.sh 2012-04-26 16:08:59.000000000 +0200
|
|
@@ -68,7 +68,7 @@
|
|
fi
|
|
elif [ "$MODE" = "--requires" ]; then
|
|
if file $i | grep -q 'executable, .* dynamically linked'; then
|
|
- BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
|
|
+ BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | grep -v libHSffi | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
|
|
for p in ${BIN_DEPS}; do
|
|
HASH=$(${GHC_PKG} --global field $p id | sed -e "s/^id: \+//")
|
|
echo "ghc($HASH)"
|
|
diff -Nur 0.90/ghc-rpm-macros.ghc 0.90-suse-packaging/ghc-rpm-macros.ghc
|
|
--- 0.90/ghc-rpm-macros.ghc 2012-04-23 17:36:47.000000000 +0200
|
|
+++ 0.90-suse-packaging/ghc-rpm-macros.ghc 2012-04-26 16:10:36.000000000 +0200
|
|
@@ -21,13 +21,14 @@
|
|
# configure
|
|
%cabal_configure\
|
|
%ghc_check_bootstrap\
|
|
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_shared:--enable-shared} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options}
|
|
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_shared:--enable-shared} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options}
|
|
|
|
# install
|
|
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
|
|
|
# root dir for ghc docs
|
|
-%ghcdocbasedir %{_docdir}/ghc/html
|
|
+%ghcdocroot %{_datadir}/doc/ghc
|
|
+%ghcdocbasedir %{ghcdocroot}/html
|
|
# libraries doc dir
|
|
%ghclibdocdir %{ghcdocbasedir}/libraries
|
|
# top library dir
|
|
@@ -50,19 +51,19 @@
|
|
%endif\
|
|
%if 0%{!?1:1} && %{defined ghc_without_shared}\
|
|
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
|
|
- if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
|
- mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
|
|
+ if [ -d "%{buildroot}%{_docdir}/%{name}" ]; then\
|
|
+ mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-devel\
|
|
%if %{undefined ghc_exclude_docdir}\
|
|
- echo "%{_docdir}/%{name}-devel-%{version}" >> %{basepkg}-devel.files\
|
|
+ echo "%{_docdir}/%{name}-devel" >> %{basepkg}-devel.files\
|
|
%endif\
|
|
fi\
|
|
fi\
|
|
%endif\
|
|
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
|
|
-if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
|
- echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
|
-elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
|
|
- echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
|
+if [ -d "%{buildroot}%{_docdir}/%{name}" ]; then\
|
|
+ echo "%{_docdir}/%{name}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
|
+elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgname}" ]; then\
|
|
+ echo "%{_docdir}/ghc-%{pkgname}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
|
fi\
|
|
%endif\
|
|
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
|
|
@@ -105,6 +106,7 @@
|
|
%ghc_shared_files\
|
|
%if %{undefined ghc_without_shared}\
|
|
%files -n %{basepkg} -f %{basepkg}.files\
|
|
+%defattr(-,root,root,-)\
|
|
%{?base_doc_files:%doc %base_doc_files}\
|
|
%endif\
|
|
%{nil}
|
|
@@ -125,7 +127,7 @@
|
|
%define basepkg ghc-%{pkgname}\
|
|
%package -n %{basepkg}\
|
|
Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
|
|
-Group: System Environment/Libraries\
|
|
+Group: Development/Libraries/Other\
|
|
%{?1:Version: %{pkgver}}\
|
|
%{-l:License: %{-l*}}\
|
|
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
|
|
@@ -161,6 +163,7 @@
|
|
|
|
%ghc_devel_files\
|
|
%files -n %{basepkg}-devel -f %{basepkg}-devel.files\
|
|
+%defattr(-,root,root,-)\
|
|
%if %{defined ghc_without_shared}\
|
|
%{?base_doc_files:%doc %base_doc_files}\
|
|
%endif\
|
|
@@ -182,7 +185,7 @@
|
|
%define basepkg ghc-%{pkgname}\
|
|
%package -n %{basepkg}-devel\
|
|
Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
|
|
-Group: Development/Libraries\
|
|
+Group: Development/Libraries/Other\
|
|
%{?1:Version: %{pkgver}}\
|
|
%{-l:License: %{-l*}}\
|
|
%{?ghc_devel_requires}\
|
|
@@ -245,7 +248,7 @@
|
|
%ghc_lib_build()\
|
|
%global debug_package %{nil}\
|
|
%{?1:cd %1-%2}\
|
|
-%cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\
|
|
+%cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2}\
|
|
%cabal build\
|
|
%if %{undefined without_haddock}\
|
|
%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\
|