[darcs] cleanup closer to cabal2spec-0.24.1

Jens Petersen petersen at fedoraproject.org
Tue Oct 25 08:07:13 UTC 2011


commit 0437aff9fbddbb9e91046451c020cb1fe47b0075
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Oct 25 17:07:10 2011 +0900

    cleanup closer to cabal2spec-0.24.1

 darcs.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/darcs.spec b/darcs.spec
index 8b146e0..b1928d4 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -19,7 +19,7 @@ consistent and powerful theory of patches.
 # override pkg_name to allow for darcs-beta
 Name:           darcs
 Version:        2.5.2
-Release:        7%{?dist}.1
+Release:        7%{?dist}.2
 Summary:        David's Advanced Revision Control System
 
 Group:          Development/Tools
@@ -27,10 +27,14 @@ License:        GPLv2+
 URL:            http://www.darcs.net/
 # use pkg_name to allow for darcs-beta
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+# BEGIN cabal2spec
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
+%endif
+# END cabal2spec
 BuildRequires:  ghc-hashed-storage-prof, ghc-haskeline-prof, ghc-haskell98-prof, ghc-html-prof, ghc-parsec-prof, ghc-random-prof, ghc-regex-compat-prof, ghc-tar-prof, ghc-text-prof, ghc-zlib-prof
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 %if %{with tests}
@@ -68,7 +72,6 @@ cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/d
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS contrib/_darcs.zsh
 %dir %{_sysconfdir}/bash_completion.d
 %config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
@@ -78,6 +81,9 @@ cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/d
 
 
 %changelog
+* Tue Oct 25 2011 Jens Petersen <petersen at redhat.com> - 2.5.2-7.2
+- minor package cleanup closer to cabal2spec-0.24.1
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.5.2-7.1
 - rebuild with new gmp without compat lib
 


More information about the scm-commits mailing list