commit 30ed5ce0bb739c958babc8f241afd80d6e045402
Author: Jakub Bogusz <[email protected]>
Date: Fri Feb 3 23:12:25 2017 +0100
- updated to 1.5.28
- updated pngminus patch
libpng-pngminus.patch | 20 +++++++++++---------
libpng15.spec | 7 ++++---
2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/libpng15.spec b/libpng15.spec
index d0bb8d6..fe8472d 100644
--- a/libpng15.spec
+++ b/libpng15.spec
@@ -11,16 +11,16 @@ Summary(pl.UTF-8): Biblioteka PNG
Summary(pt_BR.UTF-8): Biblioteca PNG
Summary(tr.UTF-8): PNG kitaplığı
Name: libpng15
-Version: 1.5.27
+Version: 1.5.28
Release: 1
Epoch: 2
License: distributable
Group: Libraries
Source0: http://downloads.sourceforge.net/libpng/libpng-%{version}.tar.xz
-# Source0-md5: 0e53730830b3d98687d75c542977c6ea
+# Source0-md5: 847aa2a1b231c07466d7f4167537424a
Patch0: libpng-pngminus.patch
Patch1:
http://downloads.sourceforge.net/libpng-apng/libpng-%{version}-apng.patch.gz
-# Patch1-md5: 5029d64dc69bf8713f8c071d8ce40396
+# Patch1-md5: df34e8853d2387d05cedd19d5d6f56b0
URL: http://www.libpng.org/pub/png/libpng.html
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: tar >= 1:1.22
@@ -153,6 +153,7 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
%{__make} -C contrib/pngminus -f makefile.std \
LIBPATH=%{_libdir} \
CC="%{__cc}" \
+ LDFLAGS="%{rpmldflags}" \
OPT_FLAGS="%{rpmcppflags} %{rpmcflags}"
%{?with_tests:%{__make} check}
diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 5cf2f74..5776c34 100644
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,6 +1,6 @@
---- libpng-1.5.7/contrib/pngminus/makefile.std.orig 2011-12-15
16:45:32.000000000 +0100
-+++ libpng-1.5.7/contrib/pngminus/makefile.std 2011-12-18 16:24:38.099367091
+0100
-@@ -12,20 +12,20 @@
+--- libpng-1.5.28/contrib/pngminus/makefile.std.orig 2016-12-29
01:35:07.000000000 +0100
++++ libpng-1.5.28/contrib/pngminus/makefile.std 2017-02-03
23:08:53.032031871 +0100
+@@ -12,21 +12,21 @@
#PNGLIB = -L$(PNGPATH)/lib -lpng15
#PNGLIBS = $(PNGPATH)/lib/libpng15.a
PNGINC = -I../..
@@ -19,15 +19,17 @@
+ZLIB = -lz
+ZLIBS = -lz
--CFLAGS=$(PNGINC) $(ZINC)
-+CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDLIBS=$(PNGLIB) $(ZLIB)
+ CPPFLAGS=$(PNGINC) $(ZINC)
+-CFLAGS=
+-LDLIBS=$(PNGLIB) $(ZLIB)
-LDLIBSS=$(PNGLIBS) $(ZLIBS)
-+LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
++CFLAGS=$(OPT_FLAGS)
++LDLIBS=$(LDFLAGS) $(PNGLIB) $(ZLIB)
++LDLIBSS=$(LDFLAGS) $(PNGLIBS) $(ZLIBS)
C=.c
O=.o
L=.a
-@@ -33,8 +33,7 @@
+@@ -34,8 +34,7 @@
# dependencies
@@ -36,4 +38,4 @@
+all: png2pnm$(E) pnm2png$(E)
png2pnm$(O): png2pnm$(C)
- $(CC) -c $(CFLAGS) png2pnm$(C)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm$(C)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libpng15.git/commitdiff/30ed5ce0bb739c958babc8f241afd80d6e045402
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
