diff --git a/ghc-glib.spec b/ghc-glib.spec index 01fa842..aa81255 100644 --- a/ghc-glib.spec +++ b/ghc-glib.spec @@ -6,6 +6,9 @@ %global ghc_pkg_c_deps glib2-devel +# obsolete old gtk2hs packages +%global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11 + %bcond_without shared %bcond_without hscolour @@ -14,7 +17,7 @@ Name: ghc-%{pkg_name} Version: 0.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,7 +28,8 @@ 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-rpm-macros >= 0.8.1 +# 0.8.2 or later for obsoletes +BuildRequires: ghc-rpm-macros >= 0.8.2 %if %{with hscolour} BuildRequires: hscolour %endif @@ -60,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 25 2010 Jens Petersen - 0.11.2-3 +- obsolete ghc-gtk2hs gconf, gstreamer, and svgcairo +- using ghc_pkg_obsoletes from ghc-rpm-macros-0.8.2 + * Tue Sep 7 2010 Jens Petersen - 0.11.2-2 - fix the build macro