[ghc-cairo] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Tue Jan 18 04:17:24 UTC 2011


commit e538af49fccd042f0cbc9221754bcd7d7de05234
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jan 18 14:17:12 2011 +1000

    update to cabal2spec-0.22.4

 ghc-cairo.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-cairo.spec b/ghc-cairo.spec
index 4f85740..b02a730 100644
--- a/ghc-cairo.spec
+++ b/ghc-cairo.spec
@@ -8,29 +8,23 @@
 
 %global ghc_pkg_c_deps cairo-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/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-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.8.1
-%if %{with hscolour}
+BuildRequires:  ghc-rpm-macros >= 0.7.3
 BuildRequires:  hscolour
-%endif
 %{?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}}
 BuildRequires:  gtk2hs-buildtools
@@ -54,18 +48,16 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
 echo "%doc demo" >> %{name}-devel.files
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %changelog
+* Tue Jan 18 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-2
+- update to cabal2spec-0.22.4
+
 * Tue Nov 30 2010 Jens Petersen <petersen at redhat.com> - 0.12.0-1
 - update to 0.12.0
 - Gtk2HsSetup patch no longer needed


More information about the scm-commits mailing list