- update to 4000.0.6

- sync with cabal2spec-0.14

.cvsignore

@@ -1 +1 @@
-HTTP-4000.0.4.tar.gz
+HTTP-4000.0.6.tar.gz

ghc-HTTP.spec

@@ -1,8 +1,4 @@
 %global pkg_name HTTP
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -11,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        4000.0.4
+Version:        4000.0.6
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Haskell HTTP client library
 
 Group:          Development/Libraries
@@ -22,12 +18,13 @@ Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio
 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
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -52,7 +49,7 @@ built for ghc-%{ghc_version}.
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -63,13 +60,14 @@ This package contains development documentation files for the %{name} library.
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
+Summary:        Profiling libraries for %{name}
-Group: Development/Libraries
+Group:          Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -78,7 +76,7 @@ This package contains profiling libraries for %{name}.
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -127,9 +125,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -140,6 +137,10 @@ fi
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen@redhat.com> - 4000.0.6-1
+- update to 4000.0.6
+- sync with cabal2spec-0.14
+
 * Fri Feb 27 2009 Jens Petersen <petersen@redhat.com> - 4000.0.4-3
 - update url
 - update to cabal2spec-0.12:

sources

@@ -1 +1 @@
-6526c1ee59cd3aedc7aa380673c80ef1  HTTP-4000.0.4.tar.gz
+cc8d3279f3b20856b7b915045f1e908b  HTTP-4000.0.6.tar.gz