[ghc-terminfo] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Wed Jan 19 03:09:58 UTC 2011


commit ddd833ee631bd69516ad00562829a3de67bc9485
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 19 13:09:48 2011 +1000

    update to cabal2spec-0.22.4

 ghc-terminfo.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-terminfo.spec b/ghc-terminfo.spec
index 19e34ea..c261f6c 100644
--- a/ghc-terminfo.spec
+++ b/ghc-terminfo.spec
@@ -7,29 +7,23 @@
 # add any foreign library dependencies here:
 %global ghc_pkg_c_deps ncurses-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.1.3
-Release:        3%{?dist}
+Release:        4%{?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_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
@@ -51,18 +45,16 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 # workaround libdir/libncursesw.so linker script breaking linking library
 sed -i -e "s/extra-libraries: ncursesw/extra-libraries: tinfo/" -e "s!ld-options:!ld-options: /%{_lib}/libncursesw.so.5!" $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{pkg_name}-%{version}.conf
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %changelog
+* Wed Jan 19 2011 Jens Petersen <petersen at redhat.com> - 0.3.1.3-4
+- update to cabal2spec-0.22.4
+
 * Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 0.3.1.3-3
 - rebuild
 


More information about the scm-commits mailing list