[ghc-rpm-macros/el5] disable shared libraries and dynamic linking and base library packages

[Jens Petersen]

commit 84179c2284f1ab26059a6e05b3419219c4673b6f
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Dec 26 15:49:46 2013 +0900

    disable shared libraries and dynamic linking and base library packages
    
    - ghc files to build with shared libs (dyn rts fails to link needing -fPIC)
    - downgrade version

 ghc-rpm-macros.ghc  |   12 ++++--------
 ghc-rpm-macros.spec |   15 +++++++--------
 2 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index e890f8b..8601160 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -68,6 +68,8 @@ fi\
 for i in %{basepkg}.files %{basepkg}-devel.files; do\
 if [ -f "$i" ]; then\
 sed -i -e "s!%{buildroot}!!g" $i\
+cat %{basepkg}-devel.files >> %{basepkg}.files\
+mv -f %{basepkg}.files %{basepkg}-devel.files\
 fi\
 done\
 %{nil}
@@ -98,17 +100,10 @@ Requires(postun): ghc-compiler = %{ghc_version}\
 Requires:       ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
 %endif
 
-%ghc_shared_files\
-%files -n %{basepkg} -f %{basepkg}.files\
-%{?base_doc_files:%doc %base_doc_files}\
-%{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}
 
@@ -153,6 +148,7 @@ This package provides the shared library.\
 
 %ghc_devel_files\
 %files -n %{basepkg}-devel -f %{basepkg}-devel.files\
+%defattr(-,root,root,-)\
 %{?devel_doc_files:%doc %devel_doc_files}\
 %{nil}
 
@@ -211,7 +207,7 @@ This package contains the development files.
 %ghc_package_devel(c:h:l:)\
 %define pkgname %{?1}%{!?1:%{pkg_name}}\
 %define basepkg ghc-%{pkgname}\
-%ghc_devel_package\
+%ghc_devel_package -m\
 \
 %ghc_devel_description\
 \
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index f03950e..f117247 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.15.16
+Version:        0.15.15.1
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -55,16 +55,12 @@ install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
 install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
 install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
 
-# this is why this package is now arch-dependent:
-# turn off shared libs and dynamic linking on secondary archs
-%ifnarch %{ix86} x86_64
+# ghc does not build dyn rts
 cat >> %{buildroot}/%{macros_file} <<EOF
 
-# shared libraries are only supported on primary intel archs
 %%ghc_without_dynamic 1
 %%ghc_without_shared 1
 EOF
-%endif
 
 
 %clean
@@ -81,12 +77,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Dec 25 2013 Jens Petersen <petersen at redhat.com> - 0.15.16-1.el5
+* Thu Dec 26 2013 Jens Petersen <petersen at redhat.com> - 0.15.15.1-1
 - rebase from 0.10.61.1 to 0.15.16 from epel6
+- disable shared libraries and dynamic linking
+  since ghc rts fails to dyn link
+- no base library packages
 - substitute _rpmconfigdir since not defined in el5 rpm
 - restore buildroot define and cleaning
 
-* Fri Oct 25 2013 Jens Petersen <petersen at redhat.com> - 0.15.16-1
+* Fri Oct 25 2013 Jens Petersen <petersen at redhat.com>
 - add ghcpkgdocdir
 
 * Mon Jul 22 2013 Jens Petersen <petersen at redhat.com> - 0.15.15-1