From: Jakub Bogusz Date: Wed, 15 Jan 2020 19:40:29 +0000 (+0100) Subject: - added drop-Llibdir patch, drop -L%{_libdir} from `libpng-config --ldflags`; release 2 X-Git-Tag: auto/th/libpng-1.6.37-2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ac709a0a57f9666af4fddebbe7f2031fafe3f3eb;p=packages%2Flibpng.git - added drop-Llibdir patch, drop -L%{_libdir} from `libpng-config --ldflags`; release 2 --- diff --git a/libpng-drop-Llibdir.patch b/libpng-drop-Llibdir.patch new file mode 100644 index 0000000..d18b308 --- /dev/null +++ b/libpng-drop-Llibdir.patch @@ -0,0 +1,11 @@ +--- libpng-1.6.37/libpng-config.in.orig 2019-04-14 20:10:32.000000000 +0200 ++++ libpng-1.6.37/libpng-config.in 2020-01-15 19:59:39.773607141 +0100 +@@ -19,7 +19,7 @@ + libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" + all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" + I_opts="-I${includedir}" +-L_opts="-L${libdir}" ++L_opts="" + R_opts="" + cppflags="" + ccopts="" diff --git a/libpng.spec b/libpng.spec index 3c1137f..3f4db92 100644 --- a/libpng.spec +++ b/libpng.spec @@ -14,15 +14,16 @@ Summary(pt_BR.UTF-8): Biblioteca PNG Summary(tr.UTF-8): PNG kitaplığı Name: libpng Version: 1.6.37 -Release: 1 +Release: 2 Epoch: 2 License: distributable Group: Libraries Source0: http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz # Source0-md5: 015e8e15db1eecde5f2eb9eb5b6e59e9 -Patch0: %{name}-pngminus.patch -Patch1: http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz -# Patch1-md5: f02073fd96816b184c79b297775e37dc +Patch0: http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz +# Patch0-md5: f02073fd96816b184c79b297775e37dc +Patch1: %{name}-pngminus.patch +Patch2: %{name}-drop-Llibdir.patch URL: http://www.libpng.org/pub/png/libpng.html BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: tar >= 1:1.22 @@ -147,6 +148,7 @@ Narzędzia do konwersji plików PNG z lub do plików PNM. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \