[ghc-HUnit] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Mon Jan 17 08:12:58 UTC 2011


commit 1a07d868f511b8d7f389b58ef63598d4abb81084
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jan 17 18:12:44 2011 +1000

    update to cabal2spec-0.22.4

 ghc-HUnit.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec
index 6ba444a..fc27ac7 100644
--- a/ghc-HUnit.spec
+++ b/ghc-HUnit.spec
@@ -5,30 +5,24 @@
 %global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\
 for Java.
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2011.1.0.0
 Version:        1.2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hunit.sourceforge.net/
 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-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.8.1
-%if %{with hscolour}
+BuildRequires:  ghc-rpm-macros >= 0.7.3
 BuildRequires:  hscolour
-%endif
 
 %description
 %{common_description}
@@ -50,7 +44,6 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 # remove unwanted files
@@ -60,14 +53,13 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
 echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %ghc_lib_package
 
 
 %changelog
+* Mon Jan 17 2011 Jens Petersen <petersen at redhat.com> - 1.2.2.3-2
+- update to cabal2spec-0.22.4
+
 * Sun Dec  5 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.3-1
 - update to 1.2.2.3
 


More information about the scm-commits mailing list