rpms
/
ghc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- require and buildrequire libedit-devel > 2.11-2 

- move top doc dirs to main package for better sharing
- move gen_contents_index and ghost index files to main package
- protect ghc_register_pkg and ghc_unregister_pkg
This commit is contained in:
Jens Petersen 2009-02-10 08:15:40 +00:00
parent 1acf5c7d02
commit 0eea3c51b5
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-rpm-macros.ghc
View File

@ -24,8 +24,8 @@ sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \
%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir}
%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null
%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null || :
%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null
%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null || :
%ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :

35
ghc.spec
View File

@ -16,7 +16,7 @@
Name: ghc
Version: 6.10.1
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64
@ -26,14 +26,15 @@ Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
Source2: ghc-rpm-macros.ghc
URL: http://haskell.org/ghc/
Requires: gcc, gmp-devel, libedit-devel
# libedit-devel > 2.11-2 correctly requires ncurses-devel
Requires: gcc, gmp-devel, libedit-devel > 2.11-2
Requires(post): policycoreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
# introduced for f11 and to be removed for f13:
Provides: haddock = 2.3.0
BuildRequires: ghc, happy, sed
BuildRequires: gmp-devel, libedit-devel
BuildRequires: gmp-devel, libedit-devel > 2.11-2
%if %{build_doc}
BuildRequires: libxslt, docbook-style-xsl
%endif
@ -192,6 +193,17 @@ fi
%{_bindir}/*
%{_sysconfdir}/rpm/macros.ghc
%config(noreplace) %{_libdir}/ghc-%{version}/package.conf
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/LICENSE
%dir %{_docdir}/%{name}/libraries
%{_docdir}/%{name}/libraries/gen_contents_index
%ghost %{_docdir}/%{name}/libraries/doc-index.html
%ghost %{_docdir}/%{name}/libraries/haddock.css
%ghost %{_docdir}/%{name}/libraries/haddock-util.js
%ghost %{_docdir}/%{name}/libraries/haskell_icon.gif
%ghost %{_docdir}/%{name}/libraries/index.html
%ghost %{_docdir}/%{name}/libraries/minus.gif
%ghost %{_docdir}/%{name}/libraries/plus.gif
%if %{build_prof}
%files prof -f rpm-prof-filelist
@ -201,22 +213,17 @@ fi
%if %{build_doc}
%files doc -f rpm-doc-dir.files
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/LICENSE
%{_docdir}/%{name}/index.html
%{_docdir}/%{name}/libraries/gen_contents_index
%{_docdir}/%{name}/libraries/prologue.txt
%dir %{_docdir}/%{name}/libraries
%ghost %{_docdir}/%{name}/libraries/doc-index.html
%ghost %{_docdir}/%{name}/libraries/haddock.css
%ghost %{_docdir}/%{name}/libraries/haddock-util.js
%ghost %{_docdir}/%{name}/libraries/haskell_icon.gif
%ghost %{_docdir}/%{name}/libraries/index.html
%ghost %{_docdir}/%{name}/libraries/minus.gif
%ghost %{_docdir}/%{name}/libraries/plus.gif
%endif
%changelog
* Tue Feb 10 2009 Jens Petersen <petersen@redhat.com> - 6.10.1-9
- require and buildrequire libedit-devel > 2.11-2
- move top doc dirs to main package for better sharing
- move gen_contents_index and ghost index files to main package
- protect ghc_register_pkg and ghc_unregister_pkg
* Fri Jan 23 2009 Jens Petersen <petersen@redhat.com> - 6.10.1-8
- fix to libedit means can drop ncurses-devel BR workaround (#481252)