diff --git a/.gitignore b/.gitignore index c239ed6..bd6e40e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ hscolour-1.17.tar.gz /hscolour-1.19.tar.gz /hscolour-1.20.2.tar.gz +/hscolour-1.20.3.tar.gz diff --git a/hscolour-1.20.2-non-ascii.patch b/hscolour-1.20.2-non-ascii.patch deleted file mode 100644 index 4568064..0000000 --- a/hscolour-1.20.2-non-ascii.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- hscolour-1.20.2/Language/Haskell/HsColour/Anchors.hs 2012-05-30 05:56:51.000000000 +0900 -+++ hscolour/Language/Haskell/HsColour/Anchors.hs 2012-07-26 19:15:10.696737130 +0900 -@@ -42,6 +42,7 @@ - || isURIFragmentValid x - || isLower x - || isUpper x = [x] -+ | ord x >= 256 = [x] -- not correct, but better than nothing - | otherwise = ['%',hexHi (ord x), hexLo (ord x)] - hexHi d = intToDigit (d`div`16) - hexLo d = intToDigit (d`mod`16) diff --git a/hscolour.spec b/hscolour.spec index 1a2d375..d2fbc61 100644 --- a/hscolour.spec +++ b/hscolour.spec @@ -17,8 +17,8 @@ with tags, HTML 4.01 with CSS, XHTML 1.0 with inline CSS\ styling, LaTeX, and mIRC chat client codes. Name: %{pkg_name} -Version: 1.20.2 -Release: 3%{?dist} +Version: 1.20.3 +Release: 1%{?dist} Summary: Colourizes Haskell code Group: Development/Tools @@ -30,7 +30,6 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -Patch1: hscolour-1.20.2-non-ascii.patch %description %{common_description} @@ -38,7 +37,6 @@ Patch1: hscolour-1.20.2-non-ascii.patch %prep %setup -q -%patch1 -p1 -b .orig %build @@ -74,8 +72,12 @@ Patch1: hscolour-1.20.2-non-ascii.patch %changelog +* Mon Sep 10 2012 Jens Petersen - 1.20.3-1 +- update to 1.20.3, which should build with ghc-7.6 +- hscolour-1.20.2-non-ascii.patch is upstream + * Thu Jul 26 2012 Jens Petersen - 1.20.2-3 -- add upstream change to workaround errors with unicode points > 255 +- add upstream patch to workaround errors with unicode points > 255 * Thu Jul 19 2012 Fedora Release Engineering - 1.20.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 31b19d1..067c58b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e87d0e9c4cb930a31f364baf2e72ebc hscolour-1.20.2.tar.gz +86ab0303a023ac22617d14bbcd06eab8 hscolour-1.20.3.tar.gz