rpms/ghc/F-10 ghc-rpm-macros.ghc,1.3,1.4 ghc.spec,1.51,1.52
Jens Petersen
petersen at fedoraproject.org
Thu Oct 23 02:44:47 UTC 2008
Author: petersen
Update of /cvs/extras/rpms/ghc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21150
Modified Files:
ghc-rpm-macros.ghc ghc.spec
Log Message:
- use gen_contents_index to re-index haddock
- add %%pkg_docdir to cabal_configure
- requires(post) haddock09 for doc
- improve doc file lists
- no longer need to create ghost package.conf.old
- remove or rename alternatives files more consistently
Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc-rpm-macros.ghc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-rpm-macros.ghc 15 Oct 2008 03:52:21 -0000 1.3
+++ ghc-rpm-macros.ghc 23 Oct 2008 02:44:16 -0000 1.4
@@ -1,7 +1,7 @@
%cabal %{_bindir}/runhaskell Setup
%cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --haddockdir=%{_docdir}/%{hsc_name}/libraries/%{pkg_name} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --haddockdir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
%cabal_build \
%cabal build \
@@ -56,10 +56,5 @@
%{nil}
%ghc_reindex_haddock \
-if [ -f %{_bindir}/haddock -a -d %{_docdir}/%{hsc_name}/libraries ]; then \
-cd %{_docdir}/%{hsc_name}/libraries && \
-haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \\\
-$(find . \\( \\( -path ./ghc -o -path ./ghc-prim \\) -prune \\) -o \\( -name '*.haddock' -print \\) \\\
-| sed 's!.*/\\([^/]*\\).haddock!--read-interface=\\1,\\0!'); \
-fi \
+( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || : \
%{nil}
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ghc.spec 15 Oct 2008 03:47:42 -0000 1.51
+++ ghc.spec 23 Oct 2008 02:44:17 -0000 1.52
@@ -16,7 +16,7 @@
Name: ghc
Version: 6.8.3
-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
@@ -66,6 +66,7 @@
Summary: Documentation for GHC
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
+Requires(post): haddock09
%description doc
Preformatted documentation for the Glorious Glasgow Haskell
@@ -130,7 +131,8 @@
SRC_TOP=$PWD
rm -f rpm-*-filelist rpm-*.files
( cd $RPM_BUILD_ROOT
- find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf' -fprint $SRC_TOP/rpm-lib.files \)
+ find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf*' -fprint $SRC_TOP/rpm-lib.files \)
+ find .%{_docdir}/%{name}/* -type d ! -name libraries > $SRC_TOP/rpm-doc-dir.files
)
# make paths absolute (filter "./usr" to "/usr")
@@ -141,12 +143,14 @@
cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
%endif
-# create package.conf.old
-touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
-
# these are handled as alternatives
-mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs-ghc
-rm ${RPM_BUILD_ROOT}%{_bindir}/runhaskell
+for i in hsc2hs runhaskell; do
+ if [ -x ${RPM_BUILD_ROOT}%{_bindir}/$i-ghc ]; then
+ rm ${RPM_BUILD_ROOT}%{_bindir}/$i
+ else
+ mv ${RPM_BUILD_ROOT}%{_bindir}/$i{,-ghc}
+ fi
+done
%clean
rm -rf $RPM_BUILD_ROOT
@@ -174,11 +178,7 @@
%post doc
-cd %{_docdir}/ghc/libraries && \
-haddock --gen-index --gen-contents -o . -t 'Haskell Hierarchical Libraries' \
-$(find . \( \( -path ./ghc -o -path ./ghc-prim \) -prune \) -o \( -name '*.haddock' -print \) \
-| sed 's!.*/\([^/]*\).haddock!--read-interface=\1,\0!')
-
+cd %{_docdir}/ghc/libraries && ./gen_contents_index || :
%preun
if test "$1" = 0; then
@@ -204,9 +204,12 @@
%if %{build_doc}
-%files doc
+%files doc -f rpm-doc-dir.files
%defattr(-,root,root,-)
-%{_docdir}/%{name}
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/index.html
+%{_docdir}/%{name}/libraries/gen_contents_index
+%dir %{_docdir}/%{name}/libraries
%ghost %{_docdir}/%{name}/libraries/doc-index.html
%ghost %{_docdir}/%{name}/libraries/haddock.css
%ghost %{_docdir}/%{name}/libraries/haddock-util.js
@@ -218,17 +221,25 @@
%changelog
-* Tue Oct 14 2008 Bryan O'Sullivan <bos at serpentine.com> 6.8.3-8.fc10
+* Wed Oct 22 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-9
+- use gen_contents_index to re-index haddock
+- add %%pkg_docdir to cabal_configure
+- requires(post) haddock09 for doc
+- improve doc file lists
+- no longer need to create ghost package.conf.old
+- remove or rename alternatives files more consistently
+
+* Tue Oct 14 2008 Bryan O'Sullivan <bos at serpentine.com> 6.8.3-8
- Regenerate the haddock doc index automatically
- Update macros to fit in with this scheme
-* Mon Oct 13 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-7.fc10
+* Mon Oct 13 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-7
- add selinux file context for unconfined_execmem following darcs package
-* Wed Oct 1 2008 Bryan O'Sullivan <bos at serpentine.com> 6.8.3-6.fc10
+* Wed Oct 1 2008 Bryan O'Sullivan <bos at serpentine.com> 6.8.3-6
* Rename hsc2hs to hsc2hs-ghc so the alternatives symlink to it will work
-* Wed Sep 24 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-5.fc10
+* Wed Sep 24 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-5
- bring back including haddock-generated lib docs, now under docdir/ghc
- fix macros.ghc filepath (#460304)
- spec file cleanups:
@@ -238,9 +249,9 @@
- setup docs building in build.mk
- no longer need to remove network/include/Typeable.h
- install binaries under libdir not libexec
-- remove hsc2hs and runhaskell binaries since are alternatives
+- remove hsc2hs and runhaskell binaries since they are alternatives
-* Wed Sep 17 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-4.fc10
+* Wed Sep 17 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-4
- add macros.ghc for new Haskell Packaging Guidelines (#460304)
* Wed Jun 18 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.3-3
More information about the scm-commits
mailing list