rpms/haskell-platform/devel .cvsignore, 1.2, 1.3 haskell-platform.spec, 1.1, 1.2 sources, 1.2, 1.3
Jens Petersen
petersen at fedoraproject.org
Fri Jan 15 14:13:47 UTC 2010
Author: petersen
Update of /cvs/extras/rpms/haskell-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3361
Modified Files:
.cvsignore haskell-platform.spec sources
Log Message:
- update to darcs snapshot patched for ghc-6.12.1
- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
- drop doc and prof bcond
- use common_summary and common_description
- use ghc_lib_package and ghc_pkg_deps
- build shared library
- drop redundant buildroot and its install cleaning
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 29 Sep 2009 09:44:16 -0000 1.2
+++ .cvsignore 15 Jan 2010 14:13:46 -0000 1.3
@@ -1 +1 @@
-haskell-platform-2009.2.0.2.tar.gz
+haskell-platform-2009.3.1.20100115.tar.gz
Index: haskell-platform.spec
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/haskell-platform.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haskell-platform.spec 29 Sep 2009 09:44:16 -0000 1.1
+++ haskell-platform.spec 15 Jan 2010 14:13:46 -0000 1.2
@@ -1,89 +1,90 @@
-%bcond_without doc
-%bcond_without prof
+%global common_summary Standard Haskell distribution
-# ghc does not emit debug information
+%global common_description The Haskell Platform is a blessed library and tool suite for Haskell\
+distilled from Hackage.
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
%global debug_package %{nil}
%define platform_progs()\
-%{?1}Requires: ghc = 6.10.4\
-%{?1}Requires: cabal-install = 0.6.2\
+%{?1}Requires: ghc = 6.12.1\
+%{?1}Requires: cabal-install = 0.8.0\
%{?1}Requires: alex = 2.3.1\
%{?1}Requires: happy = 1.18.4\
%{nil}
%define platform_libs()\
-%{?2}Requires: ghc-cgi-%1 = 3001.1.7.1\
-%{?2}Requires: ghc-fgl-%1 = 5.4.2.2\
-%{?2}Requires: ghc-editline-%1 = 0.2.1.0\
-%{?2}Requires: ghc-GLUT-%1 = 2.1.1.2\
-%{?2}Requires: ghc-network-%1 = 2.2.1.4\
-%{?2}Requires: ghc-OpenGL-%1 = 2.2.1.1\
-%{?2}Requires: ghc-time-%1 = 1.1.2.4\
-%{?2}Requires: ghc-zlib-%1 = 0.5.0.0\
-%{?2}Requires: ghc-HTTP-%1 = 4000.0.6\
-# following are part of ghc-6.10 extralibs\
-# %{?2}Requires: ghc-HUnit-%1 = 1.2.0.3\
-# (all rest need to be packaged for 6.12):\
-# %{?2}Requires: ghc-QuickCheck-%1 = 1.2.0.0\
-# %{?2}Requires: ghc-haskell-src-%1 = 1.0.1.3\
-# %{?2}Requires: ghc-html-%1 = 1.0.1.2\
-# %{?2}Requires: ghc-mtl-%1 = 1.1.0.2\
-# %{?2}Requires: ghc-parsec-%1 = 2.1.0.1\
-# %{?2}Requires: ghc-parallel-%1 = 1.1.0.1\
-# %{?2}Requires: ghc-regex-base-%1 = 0.72.0.2\
-# %{?2}Requires: ghc-regex-compat-%1 = 0.71.0.1\
-# %{?2}Requires: ghc-regex-posix-%1 = 0.72.0.3\
-# %{?2}Requires: ghc-stm-%1 = 2.1.1.2\
-# %{?2}Requires: ghc-xhtml-%1 = 3000.2.0.1\
+%{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.1\
+%{?2}Requires: ghc-fgl%{?1:-%1} = 5.4.2.2\
+%{?2}Requires: ghc-GLUT%{?1:-%1} = 2.1.2.1\
+%{?2}Requires: ghc-haskell-src%{?1:-%1} = 1.0.1.3\
+%{?2}Requires: ghc-html%{?1:-%1} = 1.0.1.2\
+%{?2}Requires: ghc-HUnit%{?1:-%1} = 1.2.2.1\
+%{?2}Requires: ghc-mtl%{?1:-%1} = 1.1.0.2\
+%{?2}Requires: ghc-network%{?1:-%1} = 2.2.1.5\
+%{?2}Requires: ghc-OpenGL%{?1:-%1} = 2.2.3.0\
+%{?2}Requires: ghc-parsec%{?1:-%1} = 2.1.0.1\
+%{?2}Requires: ghc-parallel%{?1:-%1} = 1.1.0.1\
+%{?2}Requires: ghc-QuickCheck%{?1:-%1} = 2.1.0.2\
+%{?2}Requires: ghc-regex-base%{?1:-%1} = 0.93.1\
+%{?2}Requires: ghc-regex-compat%{?1:-%1} = 0.92\
+%{?2}Requires: ghc-regex-posix%{?1:-%1} = 0.94.1\
+%{?2}Requires: ghc-stm%{?1:-%1} = 2.1.1.2\
+%{?2}Requires: ghc-xhtml%{?1:-%1} = 3000.2.0.1\
+%{?2}Requires: ghc-zlib%{?1:-%1} = 0.5.2.0\
+%{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.0.8\
%{nil}
-
Name: haskell-platform
-Version: 2009.2.0.2
-Release: 3%{?dist}
+Version: 2009.3.1.20100115
+Release: 0.1%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
License: BSD
URL: http://hackage.haskell.org/platform
Source0: http://hackage.haskell.org/platform/%{version}/cabal/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc, ghc-rpm-macros
-%if %{with doc}
+BuildRequires: ghc, ghc-rpm-macros >= 0.5.1
BuildRequires: ghc-doc
-%endif
-%if %{with prof}
BuildRequires: ghc-prof
-%endif
%platform_progs Build
%platform_libs devel Build
%platform_progs
Requires: ghc-haskell-platform-devel = %{version}
%description
-The Haskell Platform is a blessed library and tool suite for Haskell
-distilled from Hackage.
+%{common_description}
+
+
+%package -n ghc-%{name}
+Summary: %{common_summary} library
+Group: System Environment/Libraries
+%platform_libs
+
+%description -n ghc-%{name}
+%{common_description}
+
+This package contains the shared library.
%package -n ghc-%{name}-devel
-Summary: Standard Haskell distribution libraries
+Summary: %{common_summary} development files
Group: Development/Libraries
-Provides: ghc-%{name} = %{version}-%{release}
-Requires: ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
%platform_libs devel
%description -n ghc-%{name}-devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
-%if %{with doc}
%package -n ghc-%{name}-doc
-Summary: Standard Haskell distribution documentation
+Summary: %{common_summary} documentation
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
@@ -91,23 +92,22 @@ Requires(postun): ghc-doc = %{ghc_versio
%platform_libs doc
%description -n ghc-%{name}-doc
-This package contains development documentation files for the
-%{name} library.
-%endif
+%{common_description}
+
+This package contains development documentation files.
-%if %{with prof}
%package -n ghc-%{name}-prof
-Summary: Standard Haskell distribution profiling libraries
+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
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%{common_description}
+
+This package contains profiling libraries.
%prep
@@ -117,19 +117,14 @@ built for ghc-%{ghc_version}.
%build
%cabal_configure --ghc %{?with_prof:-p}
%cabal build
-%if %{with doc}
%cabal haddock
-%endif
-%ghc_gen_scripts
%install
-rm -rf $RPM_BUILD_ROOT
%cabal_install
-# metapackage so need to create:
-mkdir -p $RPM_BUILD_ROOT%{ghcpkgdir}
-%ghc_install_scripts
-%ghc_gen_filelists ghc-%{name}
+%cabal_pkg_conf
+
+%ghc_gen_filelists
%clean
@@ -140,10 +135,8 @@ rm -rf $RPM_BUILD_ROOT
%ghc_register_pkg
-%if %{with doc}
%post -n ghc-%{name}-doc
%ghc_reindex_haddock
-%endif
%preun -n ghc-%{name}-devel
@@ -152,12 +145,10 @@ if [ "$1" -eq 0 ] ; then
fi
-%if %{with doc}
%postun -n ghc-%{name}-doc
if [ "$1" -eq 0 ] ; then
%ghc_reindex_haddock
fi
-%endif
%files
@@ -169,19 +160,24 @@ fi
%defattr(-,root,root,-)
-%if %{with doc}
%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
%defattr(-,root,root,-)
-%endif
-%if %{with prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%defattr(-,root,root,-)
-%endif
%changelog
+* Sat Jan 16 2010 Jens Petersen <petersen at redhat.com> - 2009.3.1.20100115-0.1
+- update to darcs snapshot patched for ghc-6.12.1
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common_summary and common_description
+- use ghc_lib_package and ghc_pkg_deps
+- build shared library
+- drop redundant buildroot and its install cleaning
+
* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-3
- fix rpmlint warnings (bos, #523883)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 29 Sep 2009 09:44:17 -0000 1.2
+++ sources 15 Jan 2010 14:13:46 -0000 1.3
@@ -1 +1 @@
-e81ffeb6ab1905975a6bdd8e96adb5f4 haskell-platform-2009.2.0.2.tar.gz
+517cd5442c63aedcfb3792cddbba9b03 haskell-platform-2009.3.1.20100115.tar.gz
More information about the scm-commits
mailing list