enable shared subpackages and dynamic linking on intel archs

This should now behave exactly the same as 0.15.16 in epel6.

ghc-rpm-macros.ghc

@@ -68,8 +68,6 @@ 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}
@@ -96,14 +94,22 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
 %ghc_devel_requires Requires:       ghc-compiler = %{ghc_version}\
 Requires(post): ghc-compiler = %{ghc_version}\
 Requires(postun): ghc-compiler = %{ghc_version}\
-%if 0\
+%if 0%{!?-m:1}\
 Requires:       ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
 %endif
 
+%ghc_shared_files\
+%files -n %{basepkg} -f %{basepkg}.files\
+%defattr(-,root,root,-)\
+%{?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}
 
@@ -155,6 +161,8 @@ This package provides the shared library.\
 %ghc_files()\
 %{?1:%define base_doc_files %*}\
 %define basepkg ghc-%{pkg_name}\
+%ghc_shared_files\
+\
 %ghc_devel_files\
 %{nil}
 

ghc-rpm-macros.spec

@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.15.15.2
+Version:        0.15.15.3
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -55,12 +55,16 @@ 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
 
-# ghc does not build dyn rts
+# this is why this package is now arch-dependent:
+# turn off shared libs and dynamic linking on secondary archs
+%ifnarch %{ix86} x86_64
 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
@@ -77,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 13 2014 Jens Petersen <petersen@redhat.com> - 0.15.15.3-1
+- enable shared subpackages and dynamic linking on intel archs
+
 * Fri Dec 27 2013 Jens Petersen <petersen@redhat.com> - 0.15.15.2-1
 - drop the base lib pkg requires properly