[ghc-X11-xft] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Sun Jan 16 08:24:46 UTC 2011


commit 576c014d352d5807738b5c38c26d01f64f678f4a
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun Jan 16 17:24:35 2011 +0900

    update to cabal2spec-0.22.4

 ghc-X11-xft.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec
index d148fcd..c229f87 100644
--- a/ghc-X11-xft.spec
+++ b/ghc-X11-xft.spec
@@ -9,29 +9,23 @@ and some Xrender parts.
 
 %global ghc_pkg_c_deps libXft-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.3
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 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}}
 
@@ -51,18 +45,16 @@ 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
+* Sun Jan 16 2011 Jens Petersen <petersen at redhat.com> - 0.3-13
+- update to cabal2spec-0.22.4
+
 * Sun Dec  5 2010 Jens Petersen <petersen at redhat.com> - 0.3-12
 - rebuild
 


More information about the scm-commits mailing list