[darcs] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Sat Jan 15 14:15:02 UTC 2011


commit 04e199ece2b9b41f6666201d5a09a971566d1698
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jan 15 23:14:52 2011 +0900

    update to cabal2spec-0.22.4

 darcs.spec |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/darcs.spec b/darcs.spec
index a0b9419..c2e56aa 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,5 +1,3 @@
-# Updated to cabal2spec-0.22.2 and ghc-rpm-macros-0.8.1
-
 %global pkg_name darcs
 
 %global common_summary Haskell %{pkg_name} library
@@ -21,9 +19,6 @@ consistent and powerful theory of patches.
 
 %bcond_with tests
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
@@ -36,15 +31,12 @@ Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.darcs.net/
 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
 Obsoletes:      darcs-server < 2.2.1-6
 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}}
 # for make check
@@ -76,17 +68,12 @@ Patch3:         darcs-2.5-ghc7.patch
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/darcs
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %ghc_binlib_package
 
 


More information about the scm-commits mailing list