From 836ded975127126a70c84c11c5b10fdd7d06f32e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 12 Mar 2017 13:43:32 +0900 Subject: [PATCH] obsolete geniplate and sized-types --- ghc-rpm-macros.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 1f3739b..3e47f96 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.6.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -65,11 +65,11 @@ Obsoletes: ghc-type-level < 0.2.5, ghc-type-level-devel < 0.2.5 Obsoletes: leksah < 0.14, ghc-leksah < 0.14, ghc-leksah-devel < 0.14 # dropped from HP 2014.2 (F22) Obsoletes: ghc-cgi < 3001.1.8, ghc-cgi-devel < 3001.1.8 -# for f24 +# f24 Obsoletes: ghc-citeproc-hs < 0.3.10-3, ghc-citeproc-hs-devel < 0.3.10-3 Obsoletes: ghc-hakyll < 4.5.4.0-6, ghc-hakyll-devel < 4.5.4.0-6 Obsoletes: ghc-leksah-server < 0.14.3.1-4, ghc-leksah-server-devel < 0.14.3.1-4 -# for f25 +# f25 Obsoletes: ghc-cmdtheline <= 0.2.3, ghc-cmdtheline-devel <= 0.2.3 Obsoletes: ghc-concrete-typerep <= 0.1.0.2, ghc-concrete-typerep-devel <= 0.1.0.2 Obsoletes: ghc-glade <= 0.12.5.0, ghc-glade-devel <= 0.12.5.0 @@ -82,6 +82,9 @@ Obsoletes: ghc-editline < 0.2.1.1-13, ghc-editline-devel < 0.2.1.1-13 Obsoletes: ghc-hashed-storage < 0.5.11-4, ghc-hashed-storage-devel < 0.5.11-4 Obsoletes: ghc-nats <= 0.2, ghc-nats-devel <= 0.2 Obsoletes: ghc-primes <= 0.2.1.0-11, ghc-primes-devel <= 0.2.1.0-11 +# f26 +Obsoletes: ghc-geniplate <= 0.6.0.5, ghc-geniplate-devel <= 0.6.0.5 +Obsoletes: ghc-sized-types <= 0.3.4.0, ghc-sized-types-devel <= 0.3.4.0 %description -n ghc-obsoletes Meta package for obsoleting deprecated Haskell packages. @@ -147,6 +150,9 @@ EOF %changelog +* Sun Mar 12 2017 Jens Petersen - 1.6.18-2 +- obsolete geniplate and sized-types + * Thu Mar 2 2017 Jens Petersen - 1.6.18-1 - fix ghc_fix_rpath, ghc_gen_filelists, and ghc-deps.sh when pkg-ver already installed