[ghc-utf8-string] update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
Jens Petersen
petersen at fedoraproject.org
Sat Sep 4 07:19:47 UTC 2010
commit f574ce667fc33385066dec31b91419729a2434e8
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Sep 4 17:19:46 2010 +1000
update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
ghc-utf8-string.spec | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec
index c789fda..3abb9b1 100644
--- a/ghc-utf8-string.spec
+++ b/ghc-utf8-string.spec
@@ -13,7 +13,7 @@ UTF8 without truncation.
Name: ghc-%{pkg_name}
Version: 0.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -24,7 +24,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
BuildRequires: ghc, ghc-doc, ghc-prof
-BuildRequires: ghc-rpm-macros >= 0.6.0
+BuildRequires: ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires: hscolour
+%endif
%description
%{common_description}
@@ -33,33 +36,30 @@ This package provides the shared library.
%endif
-%{?ghc_lib_package}
-
-
%prep
%setup -q -n %{pkg_name}-%{version}
%build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
%install
rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
-%ghc_strip_dynlinked
+%ghc_lib_install
%clean
rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package -o 0.3.6-5
+
+
%changelog
+* Sat Sep 4 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-5
+- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
+
* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-4
- use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0)
More information about the scm-commits
mailing list