diff --git a/buildService.patch b/buildService.patch index 5532e2e..9f56469 100644 --- a/buildService.patch +++ b/buildService.patch @@ -147,300 +147,3 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc %cabal build\ %if %{undefined without_haddock}\ %cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\ -diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc.orig 0.15.4/ghc-rpm-macros.ghc.orig ---- 0.15.4.orig/ghc-rpm-macros.ghc.orig 1970-01-01 01:00:00.000000000 +0100 -+++ 0.15.4/ghc-rpm-macros.ghc.orig 2012-02-19 15:45:21.000000000 +0100 -@@ -0,0 +1,293 @@ -+# RPM Macros for packaging Haskell cabalized packages -*-rpm-spec-*- -+# see https://fedoraproject.org/wiki/PackagingDrafts/Haskell for more details -+ -+# "cabal" -+%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_dynamic:-dynamic} Setup\ -+./Setup -+ -+# check ghc version was rebuilt against self -+%ghc_check_bootstrap\ -+if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; then\ -+ echo "Warning: this ghc build is not self-bootstrapped."\ -+%if %{undefined ghc_bootstrapping}\ -+ echo "The ghc package should be rebuilt against its current version before\ -+proceeding, to avoid dependency ABI breakage from a future ghc rebuild."\ -+ echo "To override set ghc_bootstrapping."\ -+ echo "Aborting."\ -+ exit 1\ -+%endif\ -+fi -+ -+# 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} -+ -+# install -+%cabal_install %cabal copy --destdir=%{buildroot} -v -+ -+# root dir for ghc docs -+%ghcdocbasedir %{_docdir}/ghc/html -+# libraries doc dir -+%ghclibdocdir %{ghcdocbasedir}/libraries -+# top library dir -+%ghclibdir %{_libdir}/ghc-%{ghc_version} -+ -+# ghc_gen_filelists [name] [version] -+%ghc_gen_filelists()\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define pkgver %{?2}%{!?2:%{version}}\ -+%define pkgnamever %{pkgname}-%{pkgver}\ -+%define basepkg ghc-%{pkgname}\ -+%define pkgdir %{ghclibdir}/%{pkgnamever}\ -+%define docdir %{ghclibdocdir}/%{pkgnamever}\ -+rm -f %{basepkg}.files %{basepkg}-devel.files\ -+%if %{undefined ghc_without_shared}\ -+if [ -d "%{buildroot}%{pkgdir}" ]; then\ -+echo "%dir %{pkgdir}" >> %{basepkg}.files\ -+echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\ -+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\ -+fi\ -+%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}\ -+ fi\ -+fi\ -+%endif\ -+echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\ -+if [ -d "%{buildroot}%{pkgdir}" ]; then\ -+find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\ -+find %{buildroot}%{pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> %{basepkg}-devel.files\ -+fi\ -+if [ -d "%{buildroot}%{docdir}" ]; then\ -+echo "%{docdir}" >> %{basepkg}-devel.files\ -+fi\ -+sed -i -e "s!%{buildroot}!!g" %{!?ghc_without_shared:%{basepkg}.files} %{basepkg}-devel.files\ -+%{nil} -+ -+%ghc_add_basepkg_file()\ -+%define basepkg ghc-%{pkg_name}\ -+echo "%*" >> %{basepkg}%{?ghc_without_shared:-devel}.files -+ -+# compiler version -+%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} -+ -+# create and install package.conf file -+# cabal_pkg_conf [name] [version] -+%cabal_pkg_conf()\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define pkgver %{?2}%{!?2:%{version}}\ -+%define pkgnamever %{pkgname}-%{pkgver}\ -+%cabal register --gen-pkg-config\ -+mkdir -p %{buildroot}%{ghclibdir}/package.conf.d\ -+install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\ -+%{nil} -+ -+# devel pkg basic requires -+%ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\ -+Requires(post): ghc-compiler = %{ghc_version}\ -+Requires(postun): ghc-compiler = %{ghc_version}\ -+%if %{undefined ghc_without_shared}\ -+Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\ -+%endif -+ -+%ghc_shared_files\ -+%if %{undefined ghc_without_shared}\ -+%files -n %{basepkg} -f %{basepkg}.files\ -+%{?base_doc_files:%doc %base_doc_files}\ -+%endif\ -+%{nil} -+ -+# ghc_lib_package [-c cdepslist] [-h pkgdepslist] -+%ghc_lib_package(c:h:)\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define basepkg ghc-%{pkgname}\ -+%ghc_shared_files\ -+\ -+%ghc_package_devel\ -+%{nil} -+ -+# ghc_package [-l licensetag] [name] [version] -+%ghc_package(l:)\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define pkgver %{?2}%{!?2:%{version}}\ -+%define basepkg ghc-%{pkgname}\ -+%package -n %{basepkg}\ -+Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\ -+Group: System Environment/Libraries\ -+%{?1:Version: %{pkgver}}\ -+%{-l:License: %{-l*}}\ -+%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} -+ -+# ghc_description [name] [version] -+%ghc_description\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define basepkg ghc-%{pkgname}\ -+%description -n %{basepkg}\ -+%{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ -+%if %{defined ghc_version} && %{undefined ghc_without_shared}\ -+This package provides the shared library.\ -+%endif -+ -+# ghc_binlib_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version] -+%ghc_binlib_package(c:h:l:x)\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define pkgver %{?2}%{!?2:%{version}}\ -+%define pkgnamever %{pkgname}-%{pkgver}\ -+%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgnamever}}}\ -+%define basepkg ghc-%{pkgname}\ -+%ghc_package\ -+\ -+%ghc_description\ -+\ -+%ghc_lib_package\ -+%{nil} -+ -+%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || : -+ -+# (deprecated) for docs post and postun -+%ghc_reindex_haddock : -+ -+%ghc_devel_files\ -+%files -n %{basepkg}-devel -f %{basepkg}-devel.files\ -+%if %{defined ghc_without_shared}\ -+%{?base_doc_files:%doc %base_doc_files}\ -+%endif\ -+%{?devel_doc_files:%doc %devel_doc_files}\ -+%{nil} -+ -+%ghc_files()\ -+%{?1:%define base_doc_files %*}\ -+%define basepkg ghc-%{pkg_name}\ -+%ghc_shared_files\ -+\ -+%ghc_devel_files\ -+%{nil} -+ -+# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] -+%ghc_devel_package(c:h:l:)\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define pkgver %{?2}%{!?2:%{version}}\ -+%define basepkg ghc-%{pkgname}\ -+%package -n %{basepkg}-devel\ -+Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\ -+Group: Development/Libraries\ -+%{?1:Version: %{pkgver}}\ -+%{-l:License: %{-l*}}\ -+%{?ghc_devel_requires}\ -+%{-h:Requires: %{-h*}}\ -+%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\ -+%{-c:Requires: %{-c*}}\ -+%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\ -+%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\ -+Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\ -+Provides: %{basepkg}-doc = %{pkgver}-%{release}\ -+Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\ -+Provides: %{basepkg}-prof = %{pkgver}-%{release}\ -+ -+# ghc_devel_description -+%ghc_devel_description\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define basepkg ghc-%{pkgname}\ -+%description -n %{basepkg}-devel\ -+%{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ -+\ -+This package contains the development files. -+ -+# ghc_devel_post_postun -+%ghc_devel_post_postun\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define basepkg ghc-%{pkgname}\ -+%post -n %{basepkg}-devel\ -+%ghc_pkg_recache\ -+\ -+%postun -n %{basepkg}-devel\ -+%ghc_pkg_recache -+ -+# ghc_package_devel [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] -+%ghc_package_devel(c:h:l:)\ -+%define pkgname %{?1}%{!?1:%{pkg_name}}\ -+%define basepkg ghc-%{pkgname}\ -+%ghc_devel_package\ -+\ -+%ghc_devel_description\ -+\ -+%ghc_devel_post_postun\ -+\ -+%ghc_devel_files\ -+%{nil} -+ -+# ghc_strip_dynlinked -+%ghc_strip_dynlinked\ -+%if %{undefined __debug_package}\ -+find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ -+%endif -+ -+# ghc_bin_build -+%ghc_bin_build\ -+%global debug_package %{nil}\ -+%cabal_configure\ -+%cabal build -+ -+# ghc_lib_build [name] [version] -+%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 build\ -+%if %{undefined without_haddock}\ -+%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\ -+%endif\ -+%{?1:cd -}\ -+%{nil} -+ -+# install bin package -+%ghc_bin_install\ -+%if %{undefined ghc_bootstrapping}\ -+%global _use_internal_dependency_generator 0\ -+%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\ -+%endif\ -+%cabal_install\ -+%ghc_strip_dynlinked -+ -+# ghc_lib_install [name] [version] -+%ghc_lib_install()\ -+%if %{undefined ghc_bootstrapping}\ -+%global _use_internal_dependency_generator 0\ -+%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\ -+%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\ -+%endif\ -+%{?1:cd %1-%2}\ -+%cabal_install\ -+%cabal_pkg_conf\ -+%{?1:cd -}\ -+%ghc_gen_filelists\ -+%{!?1:%ghc_strip_dynlinked}\ -+%{nil} -+ -+# skip shared and prof libs, documentation, and testsuite -+# - without_hscolour needs to be set locally in the spec file -+%ghc_bootstrap\ -+%global ghc_without_shared 1\ -+%global ghc_without_dynamic 1\ -+%global without_prof 1\ -+%global without_haddock 1\ -+%global without_manual 1\ -+%global without_testsuite 1\ -+# needs to be set also in ghc.spec\ -+%global ghc_bootstrapping 1 -+ -+# skip prof libs, and documentation -+# - without_hscolour needs to be set locally in the spec file -+%ghc_test\ -+%global without_prof 1\ -+%global without_haddock 1\ -+%global without_manual 1 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 791f818..63fafd3 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 23 07:38:02 UTC 2012 - peter.trommler@ohm-hochschule.de + +- fix patch for sle11 + +------------------------------------------------------------------- +Tue Feb 21 10:10:00 UTC 2012 - peter.trommler@ohm-hochschule.de + +- define _rpmconfigdir on SLE-11-SP1 + ------------------------------------------------------------------- Sun Feb 19 15:11:35 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index b6c9b62..a4ebe22 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -50,7 +50,9 @@ these macros. cp %{SOURCE1} %{SOURCE2} . cp %{SOURCE0} %{SOURCE3} . %patch -p1 +%if %{defined sles_version} %patch1 -p1 +%endif %build diff --git a/sle-sp1-rpmdeps.patch b/sle-sp1-rpmdeps.patch index d566934..e917cc8 100644 --- a/sle-sp1-rpmdeps.patch +++ b/sle-sp1-rpmdeps.patch @@ -18,3 +18,16 @@ diff -Nur 0.15.4/ghc-deps.sh 0.15.4.sle11-sp1/ghc-deps.sh -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}\