- updated to 1.6.21

- removed outdated sh patch

diff --git a/libpng-sh.patch b/libpng-sh.patch
deleted file mode 100644 (file)
index ab24a5f..0000000
--- a/libpng-sh.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libpng-1.6.20/tests/pngstest.orig  2015-09-26 00:48:24.000000000 +0200
-+++ libpng-1.6.20/tests/pngstest       2015-12-05 18:52:37.106053733 +0100
-@@ -17,7 +17,8 @@
- shift
- alpha="$1"
- shift
--exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $(
-+
-+loop() {
-    for f in "${srcdir}/contrib/testpngs/"*.png
-    do
-       g=
-@@ -49,4 +50,6 @@
-             test "$alpha" = "opaque" -o "$alpha" = "none" && echo "$g";;
-       esac
-    done
--)
-+}
-+
-+exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $(loop)

diff --git a/libpng.spec b/libpng.spec
index b3865218adfe235df53cf629fb03d88833254188..7ba2eaa8b178906aa419678ea49d56675a7e8d73 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without tests           # don't perform "make check"
 %bcond_without default_libpng  # don't use this libpng as default system libpng
@@ -10,17 +11,16 @@ Summary(pl.UTF-8):  Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.6.20
+Version:       1.6.21
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: 3968acb7c66ef81a9dab867f35d0eb4b
+# Source0-md5: 3bacb4728f6694a64ad9052769d6a4ce
 Patch0:                %{name}-pngminus.patch
 Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz
-# Patch1-md5:  b2186d5e7853890e25b34b03c7f2ddde
-Patch2:                %{name}-sh.patch
+# Patch1-md5:  360346394543ec0a880f61830541608f
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tar >= 1:1.22
@@ -145,7 +145,6 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure