[haddock] Revert "patch for ghc-7.8.3"

Jens Petersen petersen at fedoraproject.org
Wed Sep 3 16:13:56 UTC 2014


commit e7ae697d7426469ff3698009c86ba0c204b90e2e
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Sep 4 01:13:44 2014 +0900

    Revert "patch for ghc-7.8.3"
    
    This reverts commit f0e1d27bb8a433c712e8e9bd6e16027080f5820a.
    
    See https://github.com/haskell/haddock/issues/324 conclusions

 haddock-ghc78.patch |   62 ---------------------------------------------------
 haddock.spec        |    5 +---
 2 files changed, 1 insertions(+), 66 deletions(-)
---
diff --git a/haddock.spec b/haddock.spec
index 9d07ce1..f49309b 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -15,7 +15,6 @@ Summary:        A documentation-generation tool for Haskell libraries
 License:        BSD
 Url:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch0:         haddock-ghc78.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -62,7 +61,6 @@ This package provides the Haskell %{name} library development files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 
 %build
@@ -80,7 +78,7 @@ cd ..
 
 %ghc_fix_dynamic_rpath %{name}
 
-# version the binary so not to conflict with ghc
+# version the binary not to conflict with ghc
 mv %{buildroot}%{_bindir}/%{name}{,-%{version}}
 
 
@@ -117,7 +115,6 @@ mv %{buildroot}%{_bindir}/%{name}{,-%{version}}
 %changelog
 * Fri Aug 29 2014 Jens Petersen <petersen at redhat.com> - 2.14.3-1
 - update to 2.14.3
-- patch for ghc-7.8.3
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


More information about the scm-commits mailing list