[haskell-platform/f16] backport packaging changes from f17 rawhide

Jens Petersen petersen at fedoraproject.org
Fri Jan 20 02:36:41 UTC 2012 

commit 29cd36ae791f5a96b00ffd5d00fab47ed02f3223
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 20 11:36:10 2012 +0900

    backport packaging changes from f17 rawhide
    
    - drop ghc-haskell-platform subpackage
    - update description and source url
    - ghc-libraries replaces ghc-devel
    - only build for ghc_arches_with_ghci because of QuickCheck

 haskell-platform.spec |   98 +++++++++++++++++++++---------------------------
 1 files changed, 43 insertions(+), 55 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index bc8dc76..115feeb 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -2,10 +2,11 @@
 
 %global common_summary Standard Haskell distribution
 
-%global common_description The Haskell Platform is a blessed library and tool suite for Haskell\
-distilled from Hackage.
+%global common_description Haskell Platform is a suite of stable and well used Haskell libraries\
+and tools.  It provides a good starting environment for Haskell development.
 
 %define without_haddock 1
+%define ghc_without_shared 1
 
 %define platform_progs()\
 %{?1}Requires:       ghc = 7.0.4\
@@ -16,49 +17,47 @@ distilled from Hackage.
 
 # order here follows http://hackage.haskell.org/platform/changelog.html
 %define platform_libs()\
-%{?2}Requires:       ghc%{?1:-%1} = 7.0.4\
-%{?2}Requires:       ghc-cgi%{?1:-%1} = 3001.1.7.4\
-%{?2}Requires:       ghc-fgl%{?1:-%1} = 5.4.2.3\
-%{?2}Requires:       ghc-GLUT%{?1:-%1} = 2.1.2.1\
-%{?2}Requires:       ghc-haskell-src%{?1:-%1} = 1.0.1.4\
-%{?2}Requires:       ghc-html%{?1:-%1} = 1.0.1.2\
-%{?2}Requires:       ghc-HUnit%{?1:-%1} = 1.2.2.3\
-%{?2}Requires:       ghc-mtl%{?1:-%1} = 2.0.1.0\
-%{?2}Requires:       ghc-network%{?1:-%1} = 2.3.0.2\
-%{?2}Requires:       ghc-OpenGL%{?1:-%1} = 2.2.3.0\
-%{?2}Requires:       ghc-parallel%{?1:-%1} = 3.1.0.1\
-%{?2}Requires:       ghc-parsec%{?1:-%1} = 3.1.1\
-%{?2}Requires:       ghc-QuickCheck%{?1:-%1} = 2.4.0.1\
-%{?2}Requires:       ghc-regex-base%{?1:-%1} = 0.93.2\
-%{?2}Requires:       ghc-regex-compat%{?1:-%1} = 0.93.1\
-%{?2}Requires:       ghc-regex-posix%{?1:-%1} = 0.94.4\
-%{?2}Requires:       ghc-stm%{?1:-%1} = 2.2.0.1\
-%{?2}Requires:       ghc-syb%{?1:-%1} = 0.3\
-%{?2}Requires:       ghc-xhtml%{?1:-%1} = 3000.2.0.1\
-%{?2}Requires:       ghc-zlib%{?1:-%1} = 0.5.3.1\
-%{?2}Requires:       ghc-HTTP%{?1:-%1} = 4000.1.1\
-%{?2}Requires:       ghc-deepseq%{?1:-%1} = 1.1.0.2\
-%{?2}Requires:       ghc-text%{?1:-%1} = 0.11.0.6\
-%{?2}Requires:       ghc-transformers%{?1:-%1} = 0.2.2.0\
+%{?1}Requires:       ghc-libraries = 7.0.4\
+%{?1}Requires:       ghc-cgi-devel = 3001.1.7.4\
+%{?1}Requires:       ghc-fgl-devel = 5.4.2.3\
+%{?1}Requires:       ghc-GLUT-devel = 2.1.2.1\
+%{?1}Requires:       ghc-haskell-src-devel = 1.0.1.4\
+%{?1}Requires:       ghc-html-devel = 1.0.1.2\
+%{?1}Requires:       ghc-HUnit-devel = 1.2.2.3\
+%{?1}Requires:       ghc-mtl-devel = 2.0.1.0\
+%{?1}Requires:       ghc-network-devel = 2.3.0.2\
+%{?1}Requires:       ghc-OpenGL-devel = 2.2.3.0\
+%{?1}Requires:       ghc-parallel-devel = 3.1.0.1\
+%{?1}Requires:       ghc-parsec-devel = 3.1.1\
+%{?1}Requires:       ghc-QuickCheck-devel = 2.4.0.1\
+%{?1}Requires:       ghc-regex-base-devel = 0.93.2\
+%{?1}Requires:       ghc-regex-compat-devel = 0.93.1\
+%{?1}Requires:       ghc-regex-posix-devel = 0.94.4\
+%{?1}Requires:       ghc-stm-devel = 2.2.0.1\
+%{?1}Requires:       ghc-syb-devel = 0.3\
+%{?1}Requires:       ghc-xhtml-devel = 3000.2.0.1\
+%{?1}Requires:       ghc-zlib-devel = 0.5.3.1\
+%{?1}Requires:       ghc-HTTP-devel = 4000.1.1\
+%{?1}Requires:       ghc-deepseq-devel = 1.1.0.2\
+%{?1}Requires:       ghc-text-devel = 0.11.0.6\
+%{?1}Requires:       ghc-transformers-devel = 0.2.2.0\
 %{nil}
 
 Name:           %{pkg_name}
 Version:        2011.2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/platform
-Source0:        http://lambda.galois.com/hp-tmp/2011.2.0.1/%{name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
-# no QuickCheck on ppc64
-ExcludeArch:    ppc64
+Source0:        http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz
+ExclusiveArch:  %{ghc_arches_with_ghci}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
 %platform_progs Build
-%platform_libs devel Build
+%platform_libs Build
 %platform_progs
 Requires:       ghc-haskell-platform-devel = %{version}
 
@@ -66,28 +65,17 @@ Requires:       ghc-haskell-platform-devel = %{version}
 %{common_description}
 
 
-%package -n ghc-%{name}
-Summary:        %{common_summary} library
-Group:          System Environment/Libraries
-%platform_libs
-
-%description -n ghc-%{name}
-%{common_description}
-
-This package is for the shared libraries.
-
-
 %package -n ghc-%{name}-devel
 Summary:        %{common_summary} development files
 Group:          Development/Libraries
 %{?ghc_devel_requires}
-%{?ghc_doc_requires}
-Requires:       ghc-devel = %{ghc_version}
-%platform_libs devel
+%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}
@@ -110,9 +98,6 @@ cd %{top_prefix}
 cd %{top_prefix}
 %ghc_lib_install
 
-# remove duplicate
-rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
-
 
 %post -n ghc-%{name}-devel
 %ghc_pkg_recache
@@ -123,19 +108,22 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{top_prefix}/LICENSE
 
 
-%files -n ghc-%{name} -f %{top_prefix}/ghc-%{name}.files
-%defattr(-,root,root,-)
-
-
 %files -n ghc-%{name}-devel -f %{top_prefix}/ghc-%{name}-devel.files
-%defattr(-,root,root,-)
 
 
 %changelog
+* Fri Jan 20 2012 Jens Petersen <petersen at redhat.com> - 2011.2.0.1-3
+- update the description
+- update the source url
+- define ghc_without_shared since ghc-haskell-platform-devel no longer
+  requires ghc-haskell-platform
+- drop ghc-haskell-platform subpackage
+- require ghc-libraries instead of ghc-devel
+- use ghc_arches_with_ghci since QuickCheck still requires ghci
+
 * Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.1-2
 - ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2)

More information about the scm-commits mailing list