[ghc-xmonad-contrib] - Update to cabal2spec-0.22.4 - Rebuild

Ben Boeckel mathstuf at fedoraproject.org
Sat Jan 15 18:51:09 UTC 2011


commit ee6639164a700ccfbbaf146dcbf67b613f29e593
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Sat Jan 15 13:45:35 2011 -0500

    - Update to cabal2spec-0.22.4
    - Rebuild

 ghc-xmonad-contrib.spec |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 7d12666..a685a68 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -15,29 +15,23 @@ your own extensions.
 
 %global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.9.1
-Release:        10%{?dist}
+Release:        11%{?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")}
 Patch1:         xmonad-contrib-0.9.1-ghc7.patch
 
@@ -58,18 +52,17 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %ghc_lib_package
 
 
 %changelog
+* Sat Jan 15 2011 Ben Boeckel <mathstuf at gmail.com> - 0.9.1-11
+- Update to cabal2spec-0.22.4
+- Rebuild
+
 * Sun Dec  5 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-10
 - rebuild for syb-0.3
 


More information about the scm-commits mailing list