diff --git a/.gitignore b/.gitignore index cfb2edd..b852e30 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /netpbm-10.77.00.tar.xz /netpbm-10.78.00.tar.xz /netpbm-10.79.00.tar.xz +/netpbm-10.80.00.tar.xz diff --git a/netpbm-10.79.00-fprintf.patch b/netpbm-10.79.00-fprintf.patch deleted file mode 100644 index 7b85214..0000000 --- a/netpbm-10.79.00-fprintf.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urNp old/analyzer/pamtable.c new/analyzer/pamtable.c ---- old/analyzer/pamtable.c 2017-07-03 12:07:13.979196547 +0200 -+++ new/analyzer/pamtable.c 2017-07-03 12:09:10.567765434 +0200 -@@ -131,18 +131,18 @@ printRow(const struct pam * const pamP, - unsigned int plane; - - if (col > 0) -- fprintf(ofP, format.interTupleGutter); -+ fputs(format.interTupleGutter, ofP); - - for (plane = 0; plane < pamP->depth; ++plane) { - - if (plane > 0) -- fprintf(ofP, format.interSampleGutter); -+ fputs(format.interSampleGutter, ofP); - - fprintf(ofP, format.sampleFmt, tupleRow[col][plane]); - } - } - -- fprintf(ofP, "\n"); -+ fputs("\n", ofP); - } - - diff --git a/netpbm.spec b/netpbm.spec index 90c097e..3ff5ae3 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.79.00 -Release: 3%{?dist} +Version: 10.80.00 +Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain Group: System Environment/Libraries @@ -18,7 +18,6 @@ Patch1: netpbm-security-code.patch Patch2: netpbm-ppmfadeusage.patch Patch3: netpbm-noppmtompeg.patch Patch4: netpbm-CVE-2017-2587.patch -Patch5: netpbm-10.79.00-fprintf.patch BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libX11-devel, perl-generators, python, jasper-devel, libxml2-devel BuildRequires: ghostscript-core @@ -79,7 +78,6 @@ netpbm-doc. You'll also need to install the netpbm-progs package. %patch2 -p1 -b .ppmfadeusage %patch3 -p1 -b .noppmtompeg %patch4 -p1 -b .CVE-2587 -%patch5 -p1 -b .fprintf %build ./configure < - 10.80.00-1 +- New upstream release 10.80.00 (#1496797) + * Thu Aug 03 2017 Fedora Release Engineering - 10.79.00-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index c2a851c..42c6aef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netpbm-10.79.00.tar.xz) = 49c21835302bddcaadcde06ff5d25915c5b8a3404f0e91f920af00b79fff2ed354beb6dd5c0abe4be48a52a44b27e97127eee7e3d473ff7f637287208dbabc65 +SHA512 (netpbm-10.80.00.tar.xz) = aa4b6e376aefcad6080fa821a7351bb9fef3e10bffe61741e3be37a3bca848cafe51af029fd681f92caaa801194c664a7aa686ed0745f875a0a0b2b849336179