rpms/haddock/F-10 .cvsignore, 1.5, 1.6 haddock.spec, 1.13, 1.14 sources, 1.5, 1.6 haddock-2.0.0.0-ghc683-process.patch, 1.1, NONE

Jens Petersen petersen at fedoraproject.org
Fri Jan 23 02:25:54 UTC 2009


Author: petersen

Update of /cvs/extras/rpms/haddock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19403

Modified Files:
	.cvsignore haddock.spec sources 
Removed Files:
	haddock-2.0.0.0-ghc683-process.patch 
Log Message:
backport haddock-2.4.1 from rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2008 19:02:07 -0000	1.5
+++ .cvsignore	23 Jan 2009 02:25:23 -0000	1.6
@@ -1 +1 @@
-haddock-2.0.0.0.tar.gz
+haddock-2.4.1.tar.gz


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/haddock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- haddock.spec	26 Jun 2008 05:12:44 -0000	1.13
+++ haddock.spec	23 Jan 2009 02:25:23 -0000	1.14
@@ -1,21 +1,29 @@
-%define ghc_version 6.8.3
+%define ghc_version 6.10.1
+
+%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
+# ghc does not emit debug information
+%define debug_package %{nil}
 
 Name:           haddock
-Version:        2.0.0.0
-Release:        3%{?dist}
-Summary:        Haddock documentation tool for annotated Haskell source code
+Version:        2.4.1
+Release:        2%{?dist}
+Summary:        Haskell Documentation tool
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.haskell.org/haddock/
-Source0:        http://www.haskell.org/haddock/dist/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-ExcludeArch:	alpha ppc64
-
+# ghc has only been bootstrapped on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
-BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
-Patch1:		haddock-2.0.0.0-ghc683-process.patch
+Buildrequires:  ghc-paths-devel
+# for profiling
+BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-paths-prof
+# for doc/
+BuildRequires:  libxslt, docbook-style-xsl, autoconf
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -29,6 +37,7 @@
 %package -n ghc-%{name}
 Summary:  Libraries for working with Haddock from Haskell code
 Group:    Development/Libraries
+Provides:  ghc-%{name}-devel = %{version}-%{release}
 Requires:  ghc = %{ghc_version}
 Obsoletes: ghc682-haddock < 2.0.0.0-3
 
@@ -36,21 +45,26 @@
 Libraries for working with Haddock from Haskell code.
 
 
-# don't generate an empty debuginfo subpackage
-%define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
+%package -n ghc-%{name}-prof
+Summary: Profiling libraries for %{name}
+Group: Development/Libraries
+Requires: ghc-%{name} = %{version}-%{release}
+Requires: ghc-prof = %{ghc_version}
+
+%description -n ghc-%{name}-prof
+This package contains profiling libraries for %{name}.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-ghc682~
 
 
 %build
-runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} \
-  --datadir=%{_datadir} --docdir=%{_docdir} --htmldir=%{_docdir} \
-  --libsubdir='$compiler/$pkgid'
-runhaskell Setup.lhs build
+%cabal_configure --ghc -p
+%cabal build
+%cabal haddock
+%ghc_gen_scripts
+
 cd doc
 test -f configure || autoreconf
 ./configure
@@ -59,31 +73,68 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
-rm ${RPM_BUILD_ROOT}/%{_docdir}/LICENSE
+%cabal_install
+%ghc_install_scripts
+%ghc_gen_filelists ghc-%{name}
+
+# version since haddock is also in ghc now
+mv ${RPM_BUILD_ROOT}/%{_bindir}/haddock{,-%{version}}
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
 %post
-/usr/bin/chcon -t unconfined_execmem_exec_t %{_libexecdir}/haddock.bin >/dev/null 2>&1 || :
-
-
-%files -n ghc-%{name}
-%defattr(-,root,root)
-%{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1
+restorecon %{_bindir}/%{name}
 
+%post -n ghc-%{name}
+%ghc_register_pkg
+%ghc_reindex_haddock
+
+%preun -n ghc-%{name}
+if [ "$1" -eq 0 ] ; then
+  %ghc_unregister_pkg
+fi
+
+%postun -n ghc-%{name}
+if [ "$1" -eq 0 ] ; then
+  %ghc_reindex_haddock
+fi
 
 %files
-%defattr(-,root,root)
-%doc CHANGES LICENSE README TODO
+%defattr(-,root,root,-)
+%doc CHANGES LICENSE README
 %doc doc/haddock/*
-%{_bindir}/haddock
+%{_bindir}/haddock-%{version}
 %{_datadir}/haddock-%{version}
 
 
+%files -n ghc-%{name} -f ghc-%{name}.files
+%defattr(-,root,root,-)
+%{pkg_docdir}
+
+
+%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
+%defattr(-,root,root,-)
+
+
 %changelog
+* Tue Dec 23 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-2
+- buildrequire ghc-paths
+- no longer need haddock-2.4.1-no-ghc-paths.patch
+
+* Mon Dec 15 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-1
+- update to 2.4.1 release needed for gtk2hs
+- update source url
+- drop coreutils and autoconf from buildrequires
+- add haddock-2.4.1-no-ghc-paths.patch to workaround no ghc-paths package yet
+- provide devel package
+- use rpm macros to build and package
+- version haddock program since it is also in ghc
+- buildrequire autoconf
+
 * Thu Jun 26 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3.fc10
 - drop ghcver subpackage in line with ghc
 - obsolete ghc682-haddock


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jan 2008 19:02:07 -0000	1.5
+++ sources	23 Jan 2009 02:25:23 -0000	1.6
@@ -1 +1 @@
-ccd8b4a6f6b4fb084bdad02fbb215ca4  haddock-2.0.0.0.tar.gz
+f474065cd6996b633bbc180b32b04013  haddock-2.4.1.tar.gz


--- haddock-2.0.0.0-ghc683-process.patch DELETED ---




More information about the fedora-extras-commits mailing list