rpms/haddock/devel .cvsignore, 1.6, 1.7 Makefile, 1.2, 1.3 haddock.spec, 1.14, 1.15 sources, 1.6, 1.7 dead.package, 1.1, NONE
Jens Petersen
petersen at fedoraproject.org
Fri Dec 5 09:27:43 UTC 2008
Author: petersen
Update of /cvs/extras/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6024
Added Files:
.cvsignore Makefile haddock.spec sources
Removed Files:
dead.package
Log Message:
- 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
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 5 Dec 2008 09:27:12 -0000 1.7
@@ -0,0 +1 @@
+haddock-2.4.1.tar.gz
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 5 Dec 2008 09:27:13 -0000 1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: haddock
+# $Id$
+NAME := haddock
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
Index: haddock.spec
===================================================================
RCS file: haddock.spec
diff -N haddock.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ haddock.spec 5 Dec 2008 09:27:13 -0000 1.15
@@ -0,0 +1,206 @@
+%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.4.1
+Release: 1%{?dist}
+Summary: Haddock documentation tool for annotated Haskell source code
+
+Group: Development/Tools
+License: BSD
+URL: http://www.haskell.org/haddock/
+Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# ghc has only been bootstrapped on the following archs:
+ExclusiveArch: i386 x86_64 ppc
+BuildRequires: ghc = %{ghc_version}
+# currently workaround this with patch below
+#Buildrequires: ghc-paths
+BuildRequires: libxslt docbook-style-xsl
+BuildRequires: ghc-prof = %{ghc_version}
+Patch1: haddock-2.4.1-no-ghc-paths.patch
+
+%description
+Haddock is a tool for automatically generating hyperlinked documentation from
+annotated Haskell source code. It is primary intended for documenting
+libraries, but it is useful for any kind of Haskell code.
+
+Haddock lets you write documentation annotations next to the definitions of
+functions and types in the source code in a lightweight syntax.
+
+
+%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
+
+%description -n ghc-%{name}
+Libraries for working with Haddock from Haskell code.
+
+
+%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
+# temporary hacks until ghc-paths is available
+%patch1 -p1 -b .ghc-paths
+sed -i.orig -e "s!@GHCLIBDIR@!%{_libdir}/ghc-%{ghc_version}!" src/Main.hs
+
+%build
+%cabal_configure --ghc -p
+%cabal build
+%cabal haddock
+%ghc_gen_scripts
+
+cd doc
+test -f configure || autoreconf
+./configure
+make html
+
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+%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
+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
+%doc doc/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
+* Fri Dec 5 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-1
+- update to 2.4.1 release
+- 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
+
+* 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
+- add haddock-2.0.0.0-ghc683-process.patch to fix build with ghc-6.8.3
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0.0-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 7 2008 Bryan O'Sullivan <bos at serpentine.com> - 2.0.0.0-1
+- Update to 2.0.0.0, add library packages
+
+* Thu Dec 20 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9-2
+- Exclude alpha, ppc64
+
+* Thu Dec 20 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9-1
+- update to 0.9
+
+* Thu Aug 16 2007 Jens Petersen <petersen at redhat.com>
+- update License field
+
+* Fri Nov 3 2006 Jens Petersen <petersen at redhat.com> - 0.8-1
+- update to 0.8
+- use new cabal build system
+- update file list
+- buildrequire autoconf
+
+* Thu Sep 28 2006 Jens Petersen <petersen at redhat.com> - 0.7-4
+- rebuild for FC6
+
+* Fri Jun 30 2006 Jens Petersen <petersen at redhat.com> - 0.7-3
+- set selinux unconfined_execmem_exec_t context to allow running under
+ targeted policy (#195821)
+
+* Thu Mar 2 2006 Jens Petersen <petersen at redhat.com> - 0.7-2
+- rebuild
+
+* Tue Sep 27 2005 Jens Petersen <petersen at redhat.com> - 0.7-1
+- cleanup for Fedora Extras (Gérard Milmeister)
+ - drop versioned binary
+ - set standard buildroot
+- do not create debuginfo
+- improve the description
+
+* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com>
+- 0.7 release
+
+* Tue Jul 5 2005 Jens Petersen <petersen at haskell.org> - 0.7-0.20050705
+- update to cvs snapshot
+ - update filelist
+ - install data files in a subdir
+
+* Wed Dec 15 2004 Jens Petersen <petersen at haskell.org>
+- spec file cleanup
+- only generate docs in html
+
+* Sat Oct 11 2003 Sven Panne <sven_panne at yahoo.com>
+- Include architecture-independent files in file list
+
+* Tue Aug 26 2003 Sven Panne <sven_panne at yahoo.com>
+- Use autoreconf instead of autoconf
+
+* Mon Jul 28 2003 Sven Panne <sven_panne at yahoo.com>
+- Updated to version 0.5
+- Automagically generate configure if it is not there
+
+* Tue Jul 23 2002 Simon Marlow <simonmar at microsoft.com>
+- Updated to version 0.4
+
+* Sun Jun 23 2002 Sven Panne <sven_panne at yahoo.com>
+- Cleaned up build root handling and added more docs
+
+* Wed May 01 2002 Tom Moertel <tom-rpms at moertel.com>
+- Created spec file
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 5 Dec 2008 09:27:13 -0000 1.7
@@ -0,0 +1 @@
+f474065cd6996b633bbc180b32b04013 haddock-2.4.1.tar.gz
--- dead.package DELETED ---
More information about the fedora-extras-commits
mailing list