From 46075788d197cb0f7fde94624dcee398b8492070fd9eb80265e26544f492e34e Mon Sep 17 00:00:00 2001 From: Herbert Graeber Date: Mon, 13 Apr 2009 15:31:04 +0000 Subject: [PATCH] update rpm macros to build -devel subpackages for libraries OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=68 --- ghc.spec | 6 +++++- macros.ghc | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ghc.spec b/ghc.spec index b13b664..77b4593 100644 --- a/ghc.spec +++ b/ghc.spec @@ -179,13 +179,14 @@ fi %{_bindir}/haddock %{_mandir}/man1/ghc.1* %dir %{_libdir}/ghc-%{version} -%dir %{_libdir}/ghc-%{version}/* +%config(noreplace) %{_libdir}/ghc-%{version}/package.conf %files prof -f rpm-prof-lib-files %defattr(-,root,root) %files doc %defattr(-,root,root) +%doc LICENSE %{_datadir}/doc/%{name} %doc docs/comm %doc docs/docbook-cheat-sheet/docbook-cheat-sheet @@ -196,6 +197,9 @@ fi %doc docs/storage-mgt/sm.ps %changelog +* Mon Apr 13 2009 Herbert Graeber 6.10.2 +- update rpm macros to generate -devel subpackages for libraries + * Thu Apr 2 2009 Herbert Graeber 6.10.2 - Update to version 6.10.2 * System.FilePath.dropTrailingPathSeparator "\\" will now return "\\" rather than "". diff --git a/macros.ghc b/macros.ghc index 88a380a..59eff64 100644 --- a/macros.ghc +++ b/macros.ghc @@ -11,13 +11,13 @@ make -f cabal-rpm.mk %{_smp_mflags} \ %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v %ghc_gen_filelists() \ -rm -f %1.files %1-prof.files \ -echo '%defattr(-,root,root,-)' > %1.files \ -find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1.files \ -find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1.files \ +rm -f %1-devel.files %1-prof.files \ +echo '%defattr(-,root,root,-)' > %1-devel.files \ +find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1-devel.files \ +find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \ echo '%defattr(-,root,root,-)' > %1-prof.files \ find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \ -sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \ +sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1-devel.files %1-prof.files \ %{nil} %ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script @@ -28,4 +28,4 @@ sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \ %ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null || : -%ghc_reindex_haddock ( cd %{_datadir}/doc/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || : +%ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :