From cc33e6058af1325bb7906048b398e718e95ddb04 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 23 Sep 2014 09:26:25 -0400 Subject: [PATCH] Bump to latest, nuke the transformers-compat patch Signed-off-by: Ricky Elrod --- .gitignore | 1 + ghc-contravariant.spec | 19 ++++++++++--------- sources | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index bade88d..cad97a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /contravariant-0.5.2.tar.gz +/contravariant-1.2.tar.gz diff --git a/ghc-contravariant.spec b/ghc-contravariant.spec index 2766609..9577b34 100644 --- a/ghc-contravariant.spec +++ b/ghc-contravariant.spec @@ -6,20 +6,21 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -Version: 0.5.2 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Contravariant functors License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Patch0: %{name}-without-transformers-compat.patch +URL: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: ghc-tagged-devel +BuildRequires: ghc-semigroups-devel +BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel +BuildRequires: ghc-void-devel # End cabal-rpm deps %description @@ -41,9 +42,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -# This is so that we don't need to have a compatibility package, because -# we ship new enough packages in Fedora that we can avoid needing it. -%patch0 -p1 -b .nocompat %build %ghc_lib_build @@ -69,6 +67,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Sep 23 2014 Ricky Elrod - 1.2-1 +- Update to latest release (#1116575). + * Sat Aug 16 2014 Fedora Release Engineering - 0.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 348441d..a9aede3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66540bbada1d73af58a4470f1288d7e6 contravariant-0.5.2.tar.gz +79a965763285d6c3fe8336ae6f073bad contravariant-1.2.tar.gz