rpms/haddock/devel haddock.spec,1.19,1.20

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26453

Modified Files:
	haddock.spec 
Log Message:
- update to 2.4.2
- sync with cabal2spec-0.15




Index: haddock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- haddock.spec	9 Mar 2009 06:01:32 -0000	1.19
+++ haddock.spec	25 Apr 2009 09:26:01 -0000	1.20
@@ -1,8 +1,3 @@
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
-
 %bcond_without doc
 %bcond_without prof
 
@@ -10,8 +5,8 @@
 %global debug_package %{nil}
 
 Name:           haddock
-Version:        2.4.1
-Release:        4%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Haskell documentation tool
 
 Group:          Development/Tools
@@ -21,14 +16,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 Buildrequires:  ghc-ghc-paths-devel
 %if %{with doc}
 BuildRequires:  libxslt, docbook-style-xsl, autoconf
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 BuildRequires:  ghc-ghc-paths-prof
 %endif
 
@@ -55,9 +51,9 @@
 
 %if %{with doc}
 %package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -83,7 +79,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -149,9 +145,8 @@
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %doc doc/haddock/*
 %endif
 
@@ -163,6 +158,10 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-1
+- update to 2.4.2
+- sync with cabal2spec-0.15
+
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 2.4.1-4
 - update to cabal2spec-0.12:
   - use global and bcond