rpms/ghc-HTTP/F-11 .cvsignore, 1.3, 1.4 ghc-HTTP.spec, 1.6, 1.7 sources, 1.3, 1.4

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2299

Modified Files:
	.cvsignore ghc-HTTP.spec sources 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Feb 2009 06:30:42 -0000	1.3
+++ .cvsignore	30 May 2009 03:24:44 -0000	1.4
@@ -1 +1 @@
-HTTP-4000.0.4.tar.gz
+HTTP-4000.0.6.tar.gz


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/F-11/ghc-HTTP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ghc-HTTP.spec	27 Feb 2009 06:57:18 -0000	1.6
+++ ghc-HTTP.spec	30 May 2009 03:24:45 -0000	1.7
@@ -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,7 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        4000.0.4
+# part of haskell-platform
+Version:        4000.0.6
 Release:        3%{?dist}
 Summary:        Haskell HTTP client library
 
@@ -22,12 +19,13 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
+BuildRequires:  ghc-rpm-macros
 %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
@@ -37,6 +35,7 @@ A Haskell library for client-side HTTP.
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
+Provides:       ghc-%{pkg_name} = %{version}-%{release}
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
@@ -50,9 +49,9 @@ built for ghc-%{ghc_version}.
 
 %if %{with doc}
 %package 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}
 
@@ -63,13 +62,14 @@ This package contains development docume
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+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 +78,7 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -127,9 +127,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -140,6 +139,18 @@ fi
 
 
 %changelog
+* Sat May 30 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-3
+- ppc workaround no longer needed with ghc-6.10.3
+- provide ghc-HTTP (cabal2spec-0.17)
+
+* Wed May 13 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-2
+- rebuild with ghc-rpm-macros and ghc-6.10.3 (cabal2spec-0.16)
+
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-1
+- update to 4000.0.6
+- sync with cabal2spec-0.14
+- compile Setup on ppc to workaround runghc failure
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 4000.0.4-3
 - update url
 - update to cabal2spec-0.12:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Feb 2009 06:30:43 -0000	1.3
+++ sources	30 May 2009 03:24:45 -0000	1.4
@@ -1 +1 @@
-6526c1ee59cd3aedc7aa380673c80ef1  HTTP-4000.0.4.tar.gz
+cc8d3279f3b20856b7b915045f1e908b  HTTP-4000.0.6.tar.gz