[ghc-xmonad-contrib] update to 0.10

Jens Petersen petersen at fedoraproject.org
Sat Dec 3 05:47:48 UTC 2011


commit 5598789e6a2ac2e5b9b210a3c653f3b152d5936a
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Dec 3 14:47:30 2011 +0900

    update to 0.10

 .gitignore              |    1 +
 ghc-xmonad-contrib.spec |   21 ++++++++++++---------
 sources                 |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad2f1bf..abc83c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xmonad-contrib-0.9.1.tar.gz
 /xmonad-contrib-0.9.2.tar.gz
+/xmonad-contrib-0.10.tar.gz
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 5188f49..6dfcbd7 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -18,20 +18,22 @@ extensions, see "XMonad.Doc". In particular:\
 your own extensions.
 
 Name:           ghc-%{pkg_name}
-Version:        0.9.2
-Release:        6%{?dist}.3
+Version:        0.10
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-# BEGIN: cabal2spec-0.24
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
-# END: cabal2spec-0.24
+%endif
+# END cabal2spec
 
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
@@ -53,11 +55,11 @@ BuildRequires:  ghc-xmonad-devel
 %package -n ghc-%{pkg_name}-devel
 Summary:        Development files for %{common_summary}
 Group:          Development/Libraries
-# BEGIN: cabal2spec-0.24
+# BEGIN cabal2spec
 %{?ghc_devel_requires}
 Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
 Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
+# END cabal2spec
 
 %description -n ghc-%{pkg_name}-devel
 %{common_description}
@@ -66,11 +68,11 @@ This package contains the development files.
 
 
 %prep
-%define cabal_configure_options -f use_xft
 %setup -q -n %{pkg_name}-%{version}
 
 
 %build
+%define cabal_configure_options -f use_xft
 %ghc_lib_build
 
 
@@ -87,14 +89,15 @@ This package contains the development files.
 
 %if %{undefined ghc_without_shared}
 %files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%defattr(-,root,root,-)
 %endif
 
 %files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%defattr(-,root,root,-)
 
 
 %changelog
+* Sat Dec  3 2011 Jens Petersen <petersen at redhat.com> - 0.10-1
+- update to 0.10
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.9.2-6.3
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index d666452..8a65800 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-616cbc632bbde5cd4cdb643ee47e74d2  xmonad-contrib-0.9.2.tar.gz
+9a4353a94ec0ea3a9c4700757ef5ae81  xmonad-contrib-0.10.tar.gz


More information about the scm-commits mailing list