rpms/ghc-HTTP/devel ghc-HTTP.spec,1.22,1.23
Jens Petersen
petersen at fedoraproject.org
Sat Jun 26 13:07:56 UTC 2010
Author: petersen
Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25148
Modified Files:
ghc-HTTP.spec
Log Message:
sync cabal2spec-0.22
Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ghc-HTTP.spec 27 Apr 2010 02:36:29 -0000 1.22
+++ ghc-HTTP.spec 26 Jun 2010 13:07:55 -0000 1.23
@@ -14,18 +14,18 @@
Name: ghc-%{pkg_name}
# part of haskell-platform-2010.1.0.0
Version: 4000.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
License: BSD
URL: http://projects.haskell.org/http/
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc, ghc-rpm-macros >= 0.5.1
-BuildRequires: ghc-doc
-BuildRequires: ghc-prof
+BuildRequires: ghc, ghc-doc, ghc-prof
+BuildRequires: ghc-rpm-macros >= 0.7.0
%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
%description
@@ -43,16 +43,12 @@ This package provides the shared library
%build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
%install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
%clean
@@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 4000.0.9-4
+- sync cabal2spec-0.22
+
* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 4000.0.9-3
- rebuild against ghc-6.12.2
More information about the scm-commits
mailing list