[ghc-chalmers-lava2000] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Mon Jan 17 12:28:48 UTC 2011


commit a2070b93d5c2d086991f4a8a97085f281db66e83
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jan 17 22:28:35 2011 +1000

    update to cabal2spec-0.22.4

 ghc-chalmers-lava2000.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec
index 92fabb6..adf4ae2 100644
--- a/ghc-chalmers-lava2000.spec
+++ b/ghc-chalmers-lava2000.spec
@@ -4,15 +4,12 @@
 
 %global common_description A Hardware description library for Haskell.
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -23,14 +20,11 @@ Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio
 Source1:        README.fedora
 Patch0:         ghc-chalmers-lava2000-remove-verification-modules.patch
 
-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.8.1
-%if %{with hscolour}
+BuildRequires:  ghc-rpm-macros >= 0.7.3
 BuildRequires:  hscolour
-%endif
 Patch1:         chalmers-lava2000-1.1.1-ghc7.patch
 
 %description
@@ -52,7 +46,6 @@ This package provides the shared library.
 
 
 %install
-%{__rm} -rf %{buildroot}
 %ghc_lib_install
 
 # cleanup extra data files
@@ -63,14 +56,13 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files
 %{__rm} -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{Doc,INSTALL}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %ghc_lib_package
 
 
 %changelog
+* Mon Jan 17 2011 Jens Petersen <petersen at redhat.com> - 1.1.1-9
+- update to cabal2spec-0.22.4
+
 * Mon Nov 29 2010 Jens Petersen <petersen at redhat.com> - 1.1.1-8
 - bump base to 4 for ghc 7
 - update url and drop -o obsoletes


More information about the scm-commits mailing list