[cpphs] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Sat Jan 15 14:07:51 UTC 2011


commit ce57de05c0b8d541397d46ccc36a1da92385e601
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jan 15 23:07:41 2011 +0900

    update to cabal2spec-0.22.4

 cpphs.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/cpphs.spec b/cpphs.spec
index 357556e..2800acc 100644
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -11,28 +11,22 @@ compatible with traditional (K&R) pre-processors. Additional features\
 include: a plain-text mode; an option to unlit literate code files; and\
 an option to turn off macro-expansion.
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           %{pkg_name}
 Version:        1.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{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}
@@ -55,15 +49,13 @@ BuildRequires:  hscolour
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %changelog
+* Sat Jan 15 2011 Jens Petersen <petersen at redhat.com> - 1.11-6
+- update to cabal2spec-0.22.4
+
 * Mon Nov 29 2010 Jens Petersen <petersen at redhat.com> - 1.11-5
 - update url and drop -o obsoletes
 


More information about the scm-commits mailing list