[haskell-platform/f15] backport packaging updates: drop ghc-haskell-platform subpackage

Jens Petersen petersen at fedoraproject.org
Fri Jan 20 06:24:44 UTC 2012 

commit 4969d1f5ab30ea4598017799d33bc1b171946ade
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 20 15:23:49 2012 +0900

    backport packaging updates: drop ghc-haskell-platform subpackage
    
    - update the description and source url
    - ghc-libraries replaces ghc-devel
    - use ghc_arches_with_ghci since QuickCheck still requires ghci
    - change to use main large tarball release

 haskell-platform.spec |  136 +++++++++++++++++++++---------------------------
 1 files changed, 60 insertions(+), 76 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index c982578..969b2ad 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -2,12 +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
-
-%global upstream_version 2011.2.0.0
+%define ghc_without_shared 1
 
 %define platform_progs()\
 %{?1}Requires:       ghc = 7.0.2\
@@ -16,47 +15,48 @@ distilled from Hackage.
 %{?1}Requires:       happy = 1.18.6\
 %{nil}
 
+# order here follows http://hackage.haskell.org/platform/changelog.html
 %define platform_libs()\
-%{?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-text%{?1:-%1} = 0.11.0.5\
-%{?2}Requires:       ghc-transformers%{?1:-%1} = 0.2.2.0\
+%{?1}Requires:       ghc-libraries = 7.0.2\
+%{?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-text-devel = 0.11.0.5\
+%{?1}Requires:       ghc-transformers-devel = 0.2.2.0\
 %{nil}
 
 Name:           %{pkg_name}
-Version:        %{upstream_version}
-Release:        4%{?dist}
+Version:        2011.2.0.0
+Release:        6%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/platform
-Source0:        http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9 ppc64
-BuildRequires:  ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.3
+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}
 
@@ -64,25 +64,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}
@@ -90,33 +82,21 @@ Obsoletes:      ghc-%{name}-doc < 2010.2.0.0-0.1
 This package is for the development files.
 
 
-%package -n ghc-%{name}-prof
-Summary:        %{common_summary} profiling libraries
-Group:          Development/Libraries
-Requires:       ghc-%{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-%platform_libs prof
-
-%description -n ghc-%{name}-prof
-%{common_description}
-
-This package is for the profiling libraries.
-
+%global top_prefix packages/%{name}-%{version}
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q -n %{name}-%{version}
 
 
 %build
+cd %{top_prefix}
 %ghc_lib_build
 
 
 %install
+cd %{top_prefix}
 %ghc_lib_install
 
-# remove duplicate
-rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
-
 
 %post -n ghc-%{name}-devel
 %ghc_pkg_recache
@@ -127,23 +107,27 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
 
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE
-
+%doc %{top_prefix}/LICENSE
 
-%files -n ghc-%{name} -f ghc-%{name}.files
-%defattr(-,root,root,-)
 
-
-%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%defattr(-,root,root,-)
-
-
-%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
-%defattr(-,root,root,-)
+%files -n ghc-%{name}-devel -f %{top_prefix}/ghc-%{name}-devel.files
 
 
 %changelog
+* Fri Jan 20 2012 Jens Petersen <petersen at redhat.com> - 2011.2.0.0-6
+- 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
+- use top_prefix for path to haskell-platform subdir in large tarball
+- drop upstream_version
+
+* Fri May 27 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.0-5
+- drop the prof subpackage
+
 * Wed May 25 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.0-4
 - add ppc64 arch

More information about the scm-commits mailing list