rpms/haskell-platform/devel haskell-platform.spec, 1.8, 1.9 haskell-platform-2010.1.0.0-ghc-6.12.2.patch, 1.2, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/haskell-platform/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17390

Modified Files:
	haskell-platform.spec 
Removed Files:
	haskell-platform-2010.1.0.0-ghc-6.12.2.patch 
Log Message:
- update to 2010.2.0.0 RC
- obsolete ghc-haskell-platform-doc in line with ghc-rpm-macros-0.8.0




Index: haskell-platform.spec
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/haskell-platform.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- haskell-platform.spec	27 Jun 2010 08:42:01 -0000	1.8
+++ haskell-platform.spec	15 Jul 2010 15:24:07 -0000	1.9
@@ -7,20 +7,20 @@ distilled from Hackage.
 
 %bcond_without shared
 
-%global upstream_version 2010.1.0.0
+%global upstream_version 2010.2.0.0
 
 # enable debugging to avoid empty strip error
 
 %define platform_progs()\
 %{?1}Requires:       ghc = 6.12.3\
-%{?1}Requires:       cabal-install = 0.8.0\
-%{?1}Requires:       alex = 2.3.2\
-%{?1}Requires:       happy = 1.18.4\
+%{?1}Requires:       cabal-install = 0.8.2\
+%{?1}Requires:       alex = 2.3.3\
+%{?1}Requires:       happy = 1.18.5\
 %{nil}
 
 %define platform_libs()\
-%{?2}Requires:       ghc-cgi%{?1:-%1} = 3001.1.7.2\
-%{?2}Requires:       ghc-fgl%{?1:-%1} = 5.4.2.2\
+%{?2}Requires:       ghc-cgi%{?1:-%1} = 3001.1.7.3\
+%{?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.3\
 %{?2}Requires:       ghc-html%{?1:-%1} = 1.0.1.2\
@@ -30,11 +30,11 @@ distilled from Hackage.
 %{?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} = 2.2.0.1\
-%{?2}Requires:       ghc-QuickCheck%{?1:-%1} = 2.1.0.3\
-%{?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-QuickCheck%{?1:-%1} = 2.1.1.1\
+%{?2}Requires:       ghc-regex-base%{?1:-%1} = 0.93.2\
+%{?2}Requires:       ghc-regex-compat%{?1:-%1} = 0.93\
+%{?2}Requires:       ghc-regex-posix%{?1:-%1} = 0.94.2\
+%{?2}Requires:       ghc-stm%{?1:-%1} = 2.1.2.1\
 %{?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.9\
@@ -42,8 +42,8 @@ distilled from Hackage.
 %{nil}
 
 Name:           %{pkg_name}
-Version:        %{upstream_version}.6123
-Release:        1%{?dist}
+Version:        %{upstream_version}
+Release:        0.1%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
@@ -53,13 +53,12 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc, ghc-prof
 BuildRequires:  ghc-rpm-macros >= 0.7.0
 %platform_progs Build
 %platform_libs devel Build
 %platform_progs
 Requires:       ghc-haskell-platform-devel = %{version}
-Patch1:         haskell-platform-2010.1.0.0-ghc-6.12.2.patch
 
 %description
 %{common_description}
@@ -80,7 +79,9 @@ This package contains the shared library
 Summary:        %{common_summary} development files
 Group:          Development/Libraries
 %{?ghc_requires}
+%{?ghc_doc_requires}
 %platform_libs devel
+Obsoletes:      ghc-%{name}-doc < 2010.2.0.0-0.1
 
 %description -n ghc-%{name}-devel
 %{common_description}
@@ -88,20 +89,6 @@ Group:          Development/Libraries
 This package contains the development files.
 
 
-%package -n ghc-%{name}-doc
-Summary:        %{common_summary} documentation
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-%platform_libs doc
-
-%description -n ghc-%{name}-doc
-%{common_description}
-
-This package contains development documentation files.
-
-
 %package -n ghc-%{name}-prof
 Summary:        %{common_summary} profiling libraries
 Group:          Development/Libraries
@@ -117,7 +104,6 @@ This package contains profiling librarie
 
 %prep
 %setup -q -n %{name}-%{upstream_version}
-%patch1 -p1 -b .orig
 
 
 %build
@@ -173,6 +159,10 @@ fi
 
 
 %changelog
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0-0.1
+- update to 2010.2.0.0 RC
+- obsolete ghc-haskell-platform-doc in line with ghc-rpm-macros-0.8.0
+
 * Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0.6123-1
 - bump ghc to 6.12.3
 - sync cabal2spec-0.22.1


--- haskell-platform-2010.1.0.0-ghc-6.12.2.patch DELETED ---