[ghc-xmonad-contrib] update to cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Fri Jan 6 09:53:38 UTC 2012
commit e04e1ce0a1675f2b0e1cdd70ac438d1ead3d9b79
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jan 6 18:53:12 2012 +0900
update to cabal2spec-0.25.2
ghc-xmonad-contrib.spec | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 6dfcbd7..77d3d87 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -1,6 +1,6 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
%global pkg_name xmonad-contrib
@@ -19,7 +19,7 @@ your own extensions.
Name: ghc-%{pkg_name}
Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -29,10 +29,7 @@ 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
-%endif
+BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
# END cabal2spec
BuildRequires: ghc-containers-devel
@@ -52,21 +49,6 @@ BuildRequires: ghc-xmonad-devel
%{common_description}
-%package -n ghc-%{pkg_name}-devel
-Summary: Development files for %{common_summary}
-Group: Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -80,21 +62,22 @@ This package contains the development files.
%ghc_lib_install
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
+%ghc_devel_post_postun
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+
+%ghc_files
+%doc README
%changelog
+* Fri Jan 6 2012 Jens Petersen <petersen at redhat.com> - 0.10-2
+- update to cabal2spec-0.25.2
+
* Sat Dec 3 2011 Jens Petersen <petersen at redhat.com> - 0.10-1
- update to 0.10
More information about the scm-commits
mailing list