From 375b052e2572dd8b98de88a6343285b6682d449c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 Jul 2010 07:16:24 +0000 Subject: [PATCH] - RC darcs snapshot - fix ghc-regex-compat version - remove remaining "-n ghc-%{name}-doc" - add License to base library --- .cvsignore | 2 +- haskell-platform.spec | 13 ++++--------- sources | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index bae3849..2d54518 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -haskell-platform-2010.1.0.0.tar.gz +haskell-platform-2010.2.0.0.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index e75f38c..c8c4428 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -32,7 +32,7 @@ distilled from Hackage. %{?2}Requires: ghc-parallel%{?1:-%1} = 2.2.0.1\ %{?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-compat%{?1:-%1} = 0.93.1\ %{?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\ @@ -121,9 +121,6 @@ rm -rf $RPM_BUILD_ROOT %post -n ghc-%{name}-devel ghc-pkg recache - - -%post -n ghc-%{name}-doc %ghc_reindex_haddock @@ -131,7 +128,7 @@ ghc-pkg recache ghc-pkg recache -%postun -n ghc-%{name}-doc +%postun -n ghc-%{name}-devel if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi @@ -144,16 +141,13 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files %defattr(-,root,root,-) +%doc LICENSE %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) -%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files -%defattr(-,root,root,-) - - %files -n ghc-%{name}-prof -f ghc-%{name}-prof.files %defattr(-,root,root,-) @@ -162,6 +156,7 @@ fi * Fri Jul 16 2010 Jens Petersen - 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 +- add License to base library too * Sun Jun 27 2010 Jens Petersen - 2010.1.0.0.6123-1 - bump ghc to 6.12.3 diff --git a/sources b/sources index d4b98e0..20a9cba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -558736f518c6383976ede156ffd9c857 haskell-platform-2010.1.0.0.tar.gz +43eb2062083b8d70a83f20f8c1331a94 haskell-platform-2010.2.0.0.tar.gz