[ghc-MissingH] - Update to cabal2spec-0.22.4 - Rebuild

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


commit 2a0d5048cf2c9c64c58971c0538b63be6e104c3c
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Sat Jan 15 13:10:32 2011 -0500

    - Update to cabal2spec-0.22.4
    - Rebuild

 ghc-MissingH.spec |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/ghc-MissingH.spec b/ghc-MissingH.spec
index 137593e..bb242a3 100644
--- a/ghc-MissingH.spec
+++ b/ghc-MissingH.spec
@@ -8,15 +8,12 @@ should be extremely portable and easy to use.
 
 %global ghc_pkg_deps ghc-HUnit-devel, ghc-hslogger-devel, ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-regex-compat-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.1.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -28,16 +25,12 @@ Group:          System Environment/Libraries
 License:        GPLv2+
 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}}
 
 %description
 %{common_description}
@@ -58,7 +51,6 @@ iconv -f iso8859-1 -t utf-8 COPYRIGHT.orig > COPYRIGHT
 
 
 %install
-rm -rf %{buildroot}
 %ghc_lib_install
 
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
@@ -73,14 +65,14 @@ install -m 644 -p announcements/0.9.0.txt %{buildroot}%{_docdir}/%{name}-%{versi
 install -m 644 -p announcements/0.10.0.txt %{buildroot}%{_docdir}/%{name}-%{version}/announcements/0.10.0.txt
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %{?ghc_lib_package}
 
 
 %changelog
+* Sat Jan 15 2011 Ben Boeckel <mathstuf at gmail.com> - 1.1.0.3-3
+- Update to cabal2spec-0.22.4
+- Rebuild
+
 * Wed Sep 22 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.3-2
 - use iconv to fix COPYRIGHT file encoding
 - add license comments


More information about the scm-commits mailing list