[ghc: 1/2] move gtk2hs obsoletes to ghc-glib and ghc-gtk
Jens Petersen
petersen at fedoraproject.org
Thu Sep 30 08:21:49 UTC 2010
commit 06db986bc221ed84aa56bdbc0ffacea62a313b56
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Sep 30 18:21:06 2010 +1000
move gtk2hs obsoletes to ghc-glib and ghc-gtk
ghc.spec | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index b6d3d5c..5554787 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -26,7 +26,7 @@
Name: ghc
# part of haskell-platform-2010.2.0.0
Version: 6.12.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -50,20 +50,7 @@ Obsoletes: ghc-haddock-doc < 2.4.2-3
# introduced for f14
Obsoletes: ghc-time-devel < 1.1.2.4-5
Obsoletes: ghc-time-doc < 1.1.2.4-5
-# until new cabalized gtk2hs packages in f14+
-Obsoletes: ghc-cairo-devel < 0.11-1, ghc-cairo-doc < 0.11-1
-Obsoletes: ghc-gconf-devel < 0.11-1, ghc-gconf-doc < 0.11-1
-Obsoletes: ghc-gio-devel < 0.11-1, ghc-gio-doc < 0.11-1
-Obsoletes: ghc-glade-devel < 0.11-1, ghc-glade-doc < 0.11-1
-Obsoletes: ghc-glib-devel < 0.11-1, ghc-glib-doc < 0.11-1
-Obsoletes: ghc-gstreamer-devel < 0.11-1, ghc-gstreamer-doc < 0.11-1
-Obsoletes: ghc-gtk-devel < 0.11-1, ghc-gtk-doc < 0.11-1
-Obsoletes: ghc-gtkglext-devel < 0.11-1, ghc-gtkglext-doc < 0.11-1
-Obsoletes: ghc-gtksourceview2-devel < 0.11-1, ghc-gtksourceview2-doc < 0.11-1
-Obsoletes: ghc-soegtk-devel < 0.11-1, ghc-soegtk-doc < 0.11-1
-Obsoletes: ghc-svgcairo-devel < 0.11-1, ghc-svgcairo-doc < 0.11-1
-Obsoletes: ghc-vte-devel < 0.11-1, ghc-vte-doc < 0.11-1
-BuildRequires: ghc, happy, ghc-rpm-macros >= 0.8.0
+BuildRequires: ghc, happy, ghc-rpm-macros >= 0.8.2
BuildRequires: gmp-devel, ncurses-devel
Requires: gcc, gmp-devel
%if %{with shared}
@@ -109,19 +96,6 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: ghc-haddock-prof < 2.4.2-3
Obsoletes: ghc-time-prof < 1.1.2.4-5
-# gtk2hs
-Obsoletes: ghc-cairo-prof < 0.11-1
-Obsoletes: ghc-gconf-prof < 0.11-1
-Obsoletes: ghc-gio-prof < 0.11-1
-Obsoletes: ghc-glade-prof < 0.11-1
-Obsoletes: ghc-glib-prof < 0.11-1
-Obsoletes: ghc-gstreamer-prof < 0.11-1
-Obsoletes: ghc-gtk-prof < 0.11-1
-Obsoletes: ghc-gtkglext-prof < 0.11-1
-Obsoletes: ghc-gtksourceview2-prof < 0.11-1
-Obsoletes: ghc-soegtk-prof < 0.11-1
-Obsoletes: ghc-svgcairo-prof < 0.11-1
-Obsoletes: ghc-vte-prof < 0.11-1
%description prof
Profiling libraries for Glorious Glasgow Haskell Compilation System (GHC).
@@ -304,6 +278,9 @@ fi
%endif
%changelog
+* Thu Sep 30 2010 Jens Petersen <petersen at redhat.com> - 6.12.3-6
+- move gtk2hs obsoletes to ghc-glib and ghc-gtk
+
* Fri Jul 30 2010 Jens Petersen <petersen at redhat.com> - 6.12.3-5
- obsolete old gtk2hs packages for smooth upgrades
More information about the scm-commits
mailing list