rpms/ghc-regex-compat/devel ghc-regex-compat.spec,1.2,1.3
Jens Petersen
petersen at fedoraproject.org
Sun Jun 27 07:11:31 UTC 2010
Author: petersen
Update of /cvs/extras/rpms/ghc-regex-compat/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18995
Modified Files:
ghc-regex-compat.spec
Log Message:
sync cabal2spec-0.22.1
Index: ghc-regex-compat.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-regex-compat/devel/ghc-regex-compat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-regex-compat.spec 28 Apr 2010 07:07:02 -0000 1.2
+++ ghc-regex-compat.spec 27 Jun 2010 07:11:31 -0000 1.3
@@ -15,20 +15,19 @@
Name: ghc-%{pkg_name}
# part of haskell-platform-2010.1.0.0
Version: 0.92
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
License: BSD
URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
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")}
-%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description
%{common_description}
@@ -45,16 +44,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
@@ -62,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.92-4
+- sync cabal2spec-0.22.1
+
* Wed Apr 28 2010 Jens Petersen <petersen at redhat.com> - 0.92-3
- rebuild against ghc-6.12.2
- condition ghc_lib_package
More information about the scm-commits
mailing list