diff --git a/.gitignore b/.gitignore index cfc3f45..c6de1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /JuicyPixels-3.2.7.1.tar.gz /JuicyPixels-3.2.8.tar.gz /JuicyPixels-3.2.9.3.tar.gz +/JuicyPixels-3.2.9.5.tar.gz diff --git a/JuicyPixels-3.2.9.3-Progressive-Latin1.patch b/JuicyPixels-3.2.9.3-Progressive-Latin1.patch deleted file mode 100644 index 6146501..0000000 --- a/JuicyPixels-3.2.9.3-Progressive-Latin1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs~ 2018-01-01 18:46:06.000000000 +0100 -+++ JuicyPixels-3.2.9.3/src/Codec/Picture/Jpg/Progressive.hs 2018-01-27 19:26:56.780022170 +0100 -@@ -40,7 +40,7 @@ - - -- if the displayed MCU block is only displayed in half (like with - -- width 500 then we loose one macroblock of the MCU at the end of -- -- the line. Previous implementation which naïvely used full mcu -+ -- the line. Previous implementation which naively used full mcu - -- was wrong. Only taking into account visible macroblocks - indexSolo = [base + x - | y <- [0 .. compH - 1] diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 5f0acd8..059de62 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -1,18 +1,17 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name JuicyPixels %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.2.9.3 -Release: 3%{?dist} +Version: 3.2.9.5 +Release: 1%{?dist} Summary: Picture loading and serialization License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Patch0: JuicyPixels-3.2.9.3-Progressive-Latin1.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -51,7 +50,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} sed -i 's/\r$//' LICENSE -%patch0 -p1 -b .orig %build @@ -75,10 +73,13 @@ sed -i 's/\r$//' LICENSE %files devel -f %{name}-devel.files -%doc README.md docimages/* +%doc README.md changelog %changelog +* Sun Jul 22 2018 Jens Petersen - 3.2.9.5-1 +- update to 3.2.9.5 + * Fri Jul 13 2018 Fedora Release Engineering - 3.2.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e17771a..81cbd6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JuicyPixels-3.2.9.3.tar.gz) = d2921866b8082e3dc26908cece3cd8b318f7f201ea8a77373eaa433c87a906ded85c692768c95c58cf1496c4a95f9f1dd86a62afd6a1535245aeb8f203423a14 +SHA512 (JuicyPixels-3.2.9.5.tar.gz) = 7ee32404d6f99f335eb159f79e6f5fab070911bdf18d34d647721d234407615c68cc43d5f6e44b076a89989bf44428b4ccd36fc9b876da94feda6f957376f90e