From a561e2446c2a1de4832b20c9a5a4bbf22ca2c745 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 30 Sep 2010 13:32:59 +1000 Subject: [PATCH] obsolete ghc-gtk2hs gconf, gstreamer, and svgcairo - obsoletes moved from ghc - use ghc_pkg_obsoletes from ghc-rpm-macros-0.9.0 --- ghc-glib.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ghc-glib.spec b/ghc-glib.spec index 01fa842..6abea07 100644 --- a/ghc-glib.spec +++ b/ghc-glib.spec @@ -6,15 +6,12 @@ %global ghc_pkg_c_deps glib2-devel -%bcond_without shared -%bcond_without hscolour - -# debuginfo is not useful for ghc -%global debug_package %{nil} +# obsolete old gtk2hs packages +%global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11 Name: ghc-%{pkg_name} Version: 0.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,18 +22,16 @@ 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 -%if %{with hscolour} +# 0.9.0 or later for obsoletes +BuildRequires: ghc-rpm-macros >= 0.9.0 BuildRequires: hscolour -%endif %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} BuildRequires: gtk2hs-buildtools %description %{common_description} -%if %{with shared} + This package provides the shared library. -%endif %{?ghc_lib_package} @@ -60,6 +55,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.9.0 + * Tue Sep 7 2010 Jens Petersen - 0.11.2-2 - fix the build macro