[haskell-platform] update to cabal2spec-0.25.2
Jens Petersen
petersen at fedoraproject.org
Fri Jan 20 04:47:42 UTC 2012
commit 55dff49c10a5d8830bd35669d9ca6c1c1c0a113e
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jan 20 13:47:16 2012 +0900
update to cabal2spec-0.25.2
haskell-platform.spec | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 462d7af..72ccbe5 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
%global pkg_name haskell-platform
%global common_summary Standard Haskell distribution
@@ -45,17 +49,18 @@ and tools. It provides a good starting environment for Haskell development.
Name: %{pkg_name}
Version: 2011.4.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
License: BSD
+# BEGIN cabal2spec
URL: http://hackage.haskell.org/platform
Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
-BuildRequires: hscolour
+BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
%platform_progs Build
%platform_libs Build
%platform_progs
@@ -65,24 +70,6 @@ Requires: ghc-haskell-platform-devel = %{version}
%{common_description}
-%package -n ghc-%{name}-devel
-Summary: %{common_summary} development files
-Group: Development/Libraries
-%{?ghc_devel_requires}
-%platform_libs
-Obsoletes: ghc-%{name}-doc < 2010.2.0.0-0.1
-Provides: ghc-%{name}-doc = %{version}-%{release}
-Obsoletes: ghc-%{name}-prof < %{version}-%{release}
-Provides: ghc-%{name}-prof = %{version}-%{release}
-# Added for F17
-Obsoletes: ghc-%{name} < %{version}-%{release}
-
-%description -n ghc-%{name}-devel
-%{common_description}
-
-This package is for the development files.
-
-
%global top_prefix packages/%{name}-%{version}
%prep
@@ -99,6 +86,15 @@ cd %{top_prefix}
%ghc_lib_install
+# devel subpackage
+%ghc_devel_package
+%platform_libs
+# added in F17 devel cycle
+Obsoletes: ghc-%{name} < %{version}-%{release}
+
+%ghc_devel_description
+
+
%ghc_devel_post_postun
@@ -106,10 +102,13 @@ cd %{top_prefix}
%doc %{top_prefix}/LICENSE
-%files -n ghc-%{name}-devel -f %{top_prefix}/ghc-%{name}-devel.files
+%ghc_files
%changelog
+* Fri Jan 20 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.0-6
+- update to cabal2spec-0.25.2
+
* Thu Jan 19 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.0-5
- update the description
More information about the scm-commits
mailing list