From b29a82e4039cbcfff9b6ac4bf4fc301bb1f41872 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 13 Jan 2009 20:32:41 +0000 Subject: [PATCH 01/72] Setup of module mingw32-libpng --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..36d21bd --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: mingw32-libpng +# $Id$ +NAME := mingw32-libpng +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 628f4ac41b4692a43b92a91e268110dbff691ac9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Jan 2009 09:45:21 +0000 Subject: [PATCH 02/72] Initial import. --- .cvsignore | 1 + import.log | 1 + libpng-multilib.patch | 23 ++++++++++ libpng-pngconf.patch | 42 ++++++++++++++++++ mingw32-libpng.spec | 100 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 168 insertions(+) create mode 100644 import.log create mode 100644 libpng-multilib.patch create mode 100644 libpng-pngconf.patch create mode 100644 mingw32-libpng.spec diff --git a/.cvsignore b/.cvsignore index e69de29..b576525 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libpng-1.2.34.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..bf6fa25 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mingw32-libpng-1_2_34-2_fc10:HEAD:mingw32-libpng-1.2.34-2.fc10.src.rpm:1231925894 diff --git a/libpng-multilib.patch b/libpng-multilib.patch new file mode 100644 index 0000000..8b10eb9 --- /dev/null +++ b/libpng-multilib.patch @@ -0,0 +1,23 @@ +Use pkg-config to report libpng version and installation directories. + + +diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in +--- libpng-1.2.31.orig/scripts/libpng-config.in 2008-05-29 13:37:58.000000000 -0400 ++++ libpng-1.2.31/scripts/libpng-config.in 2008-08-23 16:57:20.000000000 -0400 +@@ -8,11 +8,11 @@ + + # Modeled after libxml-config. + +-version="@PNGLIB_VERSION@" +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" +-libdir="@libdir@" +-includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" ++version=`pkg-config --modversion libpng` ++prefix=`pkg-config --variable prefix libpng` ++exec_prefix=`pkg-config --variable exec_prefix libpng` ++libdir=`pkg-config --variable libdir libpng` ++includedir=`pkg-config --variable includedir libpng` + libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" + all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" + I_opts="-I${includedir}" diff --git a/libpng-pngconf.patch b/libpng-pngconf.patch new file mode 100644 index 0000000..dbaadcb --- /dev/null +++ b/libpng-pngconf.patch @@ -0,0 +1,42 @@ +diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac +--- libpng-1.2.29.orig/configure.ac 2008-05-08 07:58:11.000000000 -0400 ++++ libpng-1.2.29/configure.ac 2008-05-31 20:21:12.000000000 -0400 +@@ -63,7 +63,8 @@ + AC_MSG_CHECKING( + [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE]) + AC_TRY_COMPILE( +- [#include "$srcdir/pnggccrd.c"], ++ [#define PNG_CONFIGURE_LIBPNG ++ #include "$srcdir/pnggccrd.c"], + [return 0;], + AC_MSG_RESULT(yes) + LIBPNG_NO_MMX="", +diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h +--- libpng-1.2.29.orig/pngconf.h 2008-05-08 07:58:03.000000000 -0400 ++++ libpng-1.2.29/pngconf.h 2008-05-31 20:21:12.000000000 -0400 +@@ -35,6 +35,25 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif ++#else ++/* pngconf.h is part of the exported API. When a libpng-using application ++ includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have ++ libpng's config.h available in this case. This means that we do not have the ++ defines added to config.h and the commandline by libpng's ./configure . ++ ++ For all defines from config.h not having them set is not a problem, however ++ ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling ++ on a platform on which the MMX and SSE asm code in libpng is not supported. ++ ++ We do need this define as this define is used to determine whether or not ++ to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines ++ and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications ++ (ImageMagick for example) to determine whether or not they can use the asm ++ functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms ++ on which the MMX and SSE asm code in libpng is not supported: */ ++#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */ ++#define PNG_NO_ASSEMBLER_CODE ++#endif + #endif + + /* diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec new file mode 100644 index 0000000..55faab5 --- /dev/null +++ b/mingw32-libpng.spec @@ -0,0 +1,100 @@ +%define __strip %{_mingw32_strip} +%define __objdump %{_mingw32_objdump} +%define _use_internal_dependency_generator 0 +%define __find_requires %{_mingw32_findrequires} +%define __find_provides %{_mingw32_findprovides} + +Name: mingw32-libpng +Version: 1.2.34 +Release: 2%{?dist} +Summary: MinGW Windows Libpng library + +License: zlib +URL: http://www.libpng.org/pub/png/ +Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2 +Patch0: libpng-multilib.patch +Patch1: libpng-pngconf.patch + +Group: Development/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +BuildRequires: mingw32-filesystem >= 40 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-zlib + +Requires: pkgconfig + +%description +MinGW Windows Libpng library. + + +%prep +%setup -q -n libpng-%{version} +%patch0 -p1 +%patch1 -p1 + +%build +%{_mingw32_configure} +make + + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR=$RPM_BUILD_ROOT install + +rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a + +# No need to distribute manpages which appear in the Fedora +# native packages already. +rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO +%{_mingw32_bindir}/libpng-3.dll +%{_mingw32_bindir}/libpng-config +%{_mingw32_bindir}/libpng12-0.dll +%{_mingw32_bindir}/libpng12-config +%{_mingw32_includedir}/libpng12 +%{_mingw32_includedir}/png.h +%{_mingw32_includedir}/pngconf.h +%{_mingw32_libdir}/libpng.dll.a +%{_mingw32_libdir}/libpng.la +%{_mingw32_libdir}/libpng12.a +%{_mingw32_libdir}/libpng12.dll.a +%{_mingw32_libdir}/libpng12.la +%{_mingw32_libdir}/pkgconfig/libpng.pc +%{_mingw32_libdir}/pkgconfig/libpng12.pc + + +%changelog +* Tue Jan 13 2009 Richard W.M. Jones - 1.2.34-2 +- Depend on mingw32-filesystem >= 40 so we can still build in F-10. + +* Tue Jan 13 2009 Richard W.M. Jones - 1.2.34-1 +- Rebase to 1.2.34 and patches from Fedora. +- Requires pkgconfig. +- Add documentation. + +* Wed Sep 24 2008 Richard W.M. Jones - 1.2.31-5 +- Rename mingw -> mingw32. + +* Mon Sep 22 2008 Daniel P. Berrange - 1.2.31-4 +- Add patches from rawhide RPM + +* Sun Sep 21 2008 Richard W.M. Jones - 1.2.31-3 +- Don't duplicate Fedora native manpages. + +* Wed Sep 10 2008 Richard W.M. Jones - 1.2.31-2 +- Remove static library. + +* Tue Sep 9 2008 Daniel P. Berrange - 1.2.31-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..2b5caa3 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +37362876feb21344fd3af1228527db0f libpng-1.2.34.tar.bz2 From b4cfcb6164d001b0d8a87fad4161f3ef47755438 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Feb 2009 23:29:06 +0000 Subject: [PATCH 03/72] Rebuild for gcc 4.4 --- mingw32-libpng.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 55faab5..6a585d8 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.2.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 40 +BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-zlib @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 20 2009 Richard W.M. Jones - 1.2.34-3 +- Rebuild for mingw32-gcc 4.4 + * Tue Jan 13 2009 Richard W.M. Jones - 1.2.34-2 - Depend on mingw32-filesystem >= 40 so we can still build in F-10. From 7fb587e34b5ec65373cdfa58b1444853a6d58ccb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 01:16:33 +0000 Subject: [PATCH 04/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mingw32-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 6a585d8..7e02829 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.2.34 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.2.34-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Richard W.M. Jones - 1.2.34-3 - Rebuild for mingw32-gcc 4.4 From 2617e539df2882ffca8427cd937a69a12001f07f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 26 Feb 2009 08:50:15 +0000 Subject: [PATCH 05/72] Update to libpng 1.2.35, to fix CVE-2009-0040 (Tom Lane). --- .cvsignore | 2 +- mingw32-libpng.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b576525..5f4c598 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpng-1.2.34.tar.bz2 +libpng-1.2.35.tar.bz2 diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 7e02829..ffc8c03 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libpng -Version: 1.2.34 -Release: 4%{?dist} +Version: 1.2.35 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -36,6 +36,7 @@ MinGW Windows Libpng library. %patch0 -p1 %patch1 -p1 + %build %{_mingw32_configure} make @@ -52,6 +53,7 @@ rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a # native packages already. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} + %clean rm -rf $RPM_BUILD_ROOT @@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Richard W.M. Jones - 1.2.35-1 +- Update to libpng 1.2.35, to fix CVE-2009-0040 (Tom Lane). + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.34-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 2b5caa3..8c3b44c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37362876feb21344fd3af1228527db0f libpng-1.2.34.tar.bz2 +b8b8d09adf6bee2c5902c8e54c4f2e68 libpng-1.2.35.tar.bz2 From d7e1ea975280d2973ede4efd08de4f5e13c0a86e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jun 2009 12:52:51 +0000 Subject: [PATCH 06/72] New upstream version 1.2.37 to fix SECURITY bug RHBZ#504782. --- .cvsignore | 2 +- mingw32-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5f4c598..38b20d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpng-1.2.35.tar.bz2 +libpng-1.2.37.tar.bz2 diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index ffc8c03..9f69456 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -5,7 +5,7 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libpng -Version: 1.2.35 +Version: 1.2.37 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 9 2009 Richard W.M. Jones - 1.2.37-1 +- New upstream version 1.2.37 to fix SECURITY bug RHBZ#504782. + * Wed Feb 25 2009 Richard W.M. Jones - 1.2.35-1 - Update to libpng 1.2.35, to fix CVE-2009-0040 (Tom Lane). diff --git a/sources b/sources index 8c3b44c..0e77fca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8b8d09adf6bee2c5902c8e54c4f2e68 libpng-1.2.35.tar.bz2 +6d1ee0888dbb711214943cb19c294b49 libpng-1.2.37.tar.bz2 From 9d535e8ef55020001ca8ec354759fcb33dc811b9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 12:22:59 +0000 Subject: [PATCH 07/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- mingw32-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 9f69456..381bd41 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.2.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 1.2.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jun 9 2009 Richard W.M. Jones - 1.2.37-1 - New upstream version 1.2.37 to fix SECURITY bug RHBZ#504782. From 57baf35fa966dd40044a168046b7e849d3701fc4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Nov 2009 11:34:39 +0000 Subject: [PATCH 08/72] New upstream version 1.2.40. --- .cvsignore | 2 +- mingw32-libpng.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 38b20d8..0c15a9f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpng-1.2.37.tar.bz2 +libpng-1.2.40.tar.bz2 diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 381bd41..42e380a 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libpng -Version: 1.2.37 -Release: 2%{?dist} +Version: 1.2.40 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 5 2009 Richard W.M. Jones - 1.2.40-1 +- New upstream version 1.2.40. + * Sat Jul 25 2009 Fedora Release Engineering - 1.2.37-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 0e77fca..866aacd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d1ee0888dbb711214943cb19c294b49 libpng-1.2.37.tar.bz2 +29bbd1c3cbe54b04bfc2bda43067ccb5 libpng-1.2.40.tar.bz2 From 902be6a00b306159c57085cb31d7f4b0d4619ca0 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 20 Nov 2009 00:58:22 +0000 Subject: [PATCH 09/72] - In the previous build no symbols were exported in the resulting DLL making this package unusable. This should be fixed for now (but may need more research) --- mingw32-libpng-fix-invalid-exports.patch | 14 ++++++++++++++ mingw32-libpng.spec | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 mingw32-libpng-fix-invalid-exports.patch diff --git a/mingw32-libpng-fix-invalid-exports.patch b/mingw32-libpng-fix-invalid-exports.patch new file mode 100644 index 0000000..f73c932 --- /dev/null +++ b/mingw32-libpng-fix-invalid-exports.patch @@ -0,0 +1,14 @@ +--- configure.orig 2009-11-20 01:18:09.926590381 +0100 ++++ configure 2009-11-20 01:18:37.352678377 +0100 +@@ -11447,10 +11447,7 @@ + if test "$have_ld_version_script" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5 + $as_echo_n "checking for symbol prefix... " >&6; } +- SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ +- | ${CPP-${CC-gcc} -E} - 2>&1 \ +- | ${EGREP-grep} "^PREFIX=" \ +- | ${SED-sed} "s:^PREFIX=::"` ++ SYMBOL_PREFIX="" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5 + $as_echo "$SYMBOL_PREFIX" >&6; } diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 42e380a..7572fac 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.2.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -14,6 +14,7 @@ URL: http://www.libpng.org/pub/png/ Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2 Patch0: libpng-multilib.patch Patch1: libpng-pngconf.patch +Patch2: mingw32-libpng-fix-invalid-exports.patch Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +37,14 @@ MinGW Windows Libpng library. %patch0 -p1 %patch1 -p1 +# The configure script tries to generate a prefix which is used for +# symbol declarations. However, when this prefix is prefix is used +# the resulting DLL's don't have any exported symbols at all +# When we drop this prefix we retain backwards compatibility with +# older versions of mingw32-libpng. We might need to research this +# issue more to find out the real cause, but this will do for now +%patch2 -p0 + %build %{_mingw32_configure} @@ -78,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 20 2009 Erik van Pienbroek - 1.2.40-2 +- In the previous build no symbols were exported in the resulting DLL making this + package unusable. This should be fixed for now (but may need more research) + * Thu Nov 5 2009 Richard W.M. Jones - 1.2.40-1 - New upstream version 1.2.40. From a6a68c5085d12ca7a07b8cde8b2b03971ec90c0b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:18:49 +0000 Subject: [PATCH 10/72] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 36d21bd..36be2bf 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mingw32-libpng -# $Id$ +# $Id: Makefile,v 1.1 2009/01/13 20:32:41 kevin Exp $ NAME := mingw32-libpng SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a4a6b60c27b6ca6e4b19c8f8989050f5c8a52379 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sun, 4 Jul 2010 14:56:38 +0000 Subject: [PATCH 11/72] - Update to 1.4.3 - Fixes CVE-2010-1205 (BZ #608238) - Fixes CVE-2010-2249 (BZ #608644) - Use %global instead of %define - Fixed %defattr tag - Dropped unneeded patches --- .cvsignore | 2 +- mingw32-libpng.spec | 46 +++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c15a9f..0a4a22c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpng-1.2.40.tar.bz2 +libpng-1.4.3.tar.bz2 diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 7572fac..da69a01 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -1,19 +1,17 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-libpng -Version: 1.2.40 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2 -Patch0: libpng-multilib.patch -Patch1: libpng-pngconf.patch Patch2: mingw32-libpng-fix-invalid-exports.patch Group: Development/Libraries @@ -34,8 +32,6 @@ MinGW Windows Libpng library. %prep %setup -q -n libpng-%{version} -%patch0 -p1 -%patch1 -p1 # The configure script tries to generate a prefix which is used for # symbol declarations. However, when this prefix is prefix is used @@ -68,25 +64,31 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO -%{_mingw32_bindir}/libpng-3.dll +%defattr(-,root,root,-) +%doc ANNOUNCE CHANGES LICENSE README TODO %{_mingw32_bindir}/libpng-config -%{_mingw32_bindir}/libpng12-0.dll -%{_mingw32_bindir}/libpng12-config -%{_mingw32_includedir}/libpng12 +%{_mingw32_bindir}/libpng14-14.dll +%{_mingw32_bindir}/libpng14-config +%{_mingw32_includedir}/libpng14 %{_mingw32_includedir}/png.h %{_mingw32_includedir}/pngconf.h -%{_mingw32_libdir}/libpng.dll.a %{_mingw32_libdir}/libpng.la -%{_mingw32_libdir}/libpng12.a -%{_mingw32_libdir}/libpng12.dll.a -%{_mingw32_libdir}/libpng12.la +%{_mingw32_libdir}/libpng14.a +%{_mingw32_libdir}/libpng14.dll.a +%{_mingw32_libdir}/libpng14.la %{_mingw32_libdir}/pkgconfig/libpng.pc -%{_mingw32_libdir}/pkgconfig/libpng12.pc +%{_mingw32_libdir}/pkgconfig/libpng14.pc %changelog +* Sun Jul 4 2010 Erik van Pienbroek - 1.4.3-1 +- Update to 1.4.3 +- Fixes CVE-2010-1205 (BZ #608238) +- Fixes CVE-2010-2249 (BZ #608644) +- Use %%global instead of %%define +- Fixed %%defattr tag +- Dropped unneeded patches + * Fri Nov 20 2009 Erik van Pienbroek - 1.2.40-2 - In the previous build no symbols were exported in the resulting DLL making this package unusable. This should be fixed for now (but may need more research) diff --git a/sources b/sources index 866aacd..386932d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29bbd1c3cbe54b04bfc2bda43067ccb5 libpng-1.2.40.tar.bz2 +9347eeda4241401f7da4dc9ba7f6a416 libpng-1.4.3.tar.bz2 From e5782fb99e7c92ef7664fd70d4b575668d093e79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:21:07 +0000 Subject: [PATCH 12/72] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 36be2bf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mingw32-libpng -# $Id: Makefile,v 1.1 2009/01/13 20:32:41 kevin Exp $ -NAME := mingw32-libpng -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index bf6fa25..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -mingw32-libpng-1_2_34-2_fc10:HEAD:mingw32-libpng-1.2.34-2.fc10.src.rpm:1231925894 From eec472beb9e15cc6c1050ba184da9743394069d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:48:37 -0600 Subject: [PATCH 13/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- mingw32-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index da69a01..803d4a4 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 4 2010 Erik van Pienbroek - 1.4.3-1 - Update to 1.4.3 - Fixes CVE-2010-1205 (BZ #608238) From d3842962c9533415d668efe7751864cd7a5df2aa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 Jun 2011 10:35:04 +0100 Subject: [PATCH 14/72] Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). --- libpng-CVE-2011-2501.patch | 49 ++++++++++++++++++++++++++++++++++++++ mingw32-libpng.spec | 15 +++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 libpng-CVE-2011-2501.patch diff --git a/libpng-CVE-2011-2501.patch b/libpng-CVE-2011-2501.patch new file mode 100644 index 0000000..487d8fd --- /dev/null +++ b/libpng-CVE-2011-2501.patch @@ -0,0 +1,49 @@ +Patch from: + + http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commitdiff;h=65e6d5a34f49acdb362a0625a706c6b914e670af + +to fix: + + https://bugzilla.redhat.com/show_bug.cgi?id=717510 + https://bugzilla.redhat.com/show_bug.cgi?id=717511 + CVE-2011-2501 + +I have modified this patch to remove the changes to ANNOUNCE +and CHANGES files, and the hunk in pngerror.c which just updates +a comment. + + - RWMJ. + +From 65e6d5a34f49acdb362a0625a706c6b914e670af Mon Sep 17 00:00:00 2001 +From: Glenn Randers-Pehrson +Date: Tue, 7 Jun 2011 14:58:07 -0500 +Subject: [PATCH] [master] Fixed 1-byte uninitialized memory reference in png_format_buffer() + +(Bug report by Frank Busse, related to CVE-2004-0421). +--- + ANNOUNCE | 6 ++++-- + CHANGES | 4 +++- + pngerror.c | 11 ++++++++--- + 3 files changed, 15 insertions(+), 6 deletions(-) + +--- a/pngerror.c ++++ b/pngerror.c +@@ -186,8 +186,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp + { + buffer[iout++] = ':'; + buffer[iout++] = ' '; +- png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT); +- buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0'; ++ ++ iin = 0; ++ while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0') ++ buffer[iout++] = error_message[iin++]; ++ ++ /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */ ++ buffer[iout] = '\0'; + } + } + +-- +1.7.0.1 + diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 803d4a4..5d944e6 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -6,7 +6,7 @@ Name: mingw32-libpng Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -14,6 +14,14 @@ URL: http://www.libpng.org/pub/png/ Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2 Patch2: mingw32-libpng-fix-invalid-exports.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=717510 +# https://bugzilla.redhat.com/show_bug.cgi?id=717511 +# CVE-2011-2501 +# +# *** NOTE *** When updating the package, please ensure the +# new version either contains this fix, or this patch is retained. +Patch3: libpng-CVE-2011-2501.patch + Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,6 +49,8 @@ MinGW Windows Libpng library. # issue more to find out the real cause, but this will do for now %patch2 -p0 +%patch3 -p1 + %build %{_mingw32_configure} @@ -81,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 29 2011 Richard W.M. Jones - 1.4.3-3 +- Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). + * Tue Feb 08 2011 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From af26964030b1e706413e09b98c61e467abf14c3c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Jul 2011 13:01:56 +0300 Subject: [PATCH 15/72] Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) --- .gitignore | 1 + libpng-CVE-2011-2501.patch | 49 -------------------------------------- mingw32-libpng.spec | 20 ++++++---------- sources | 2 +- 4 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 libpng-CVE-2011-2501.patch diff --git a/.gitignore b/.gitignore index 0a4a22c..c807b4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libpng-1.4.3.tar.bz2 +/libpng-1.4.8.tar.xz diff --git a/libpng-CVE-2011-2501.patch b/libpng-CVE-2011-2501.patch deleted file mode 100644 index 487d8fd..0000000 --- a/libpng-CVE-2011-2501.patch +++ /dev/null @@ -1,49 +0,0 @@ -Patch from: - - http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commitdiff;h=65e6d5a34f49acdb362a0625a706c6b914e670af - -to fix: - - https://bugzilla.redhat.com/show_bug.cgi?id=717510 - https://bugzilla.redhat.com/show_bug.cgi?id=717511 - CVE-2011-2501 - -I have modified this patch to remove the changes to ANNOUNCE -and CHANGES files, and the hunk in pngerror.c which just updates -a comment. - - - RWMJ. - -From 65e6d5a34f49acdb362a0625a706c6b914e670af Mon Sep 17 00:00:00 2001 -From: Glenn Randers-Pehrson -Date: Tue, 7 Jun 2011 14:58:07 -0500 -Subject: [PATCH] [master] Fixed 1-byte uninitialized memory reference in png_format_buffer() - -(Bug report by Frank Busse, related to CVE-2004-0421). ---- - ANNOUNCE | 6 ++++-- - CHANGES | 4 +++- - pngerror.c | 11 ++++++++--- - 3 files changed, 15 insertions(+), 6 deletions(-) - ---- a/pngerror.c -+++ b/pngerror.c -@@ -186,8 +186,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp - { - buffer[iout++] = ':'; - buffer[iout++] = ' '; -- png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT); -- buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0'; -+ -+ iin = 0; -+ while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0') -+ buffer[iout++] = error_message[iin++]; -+ -+ /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */ -+ buffer[iout] = '\0'; - } - } - --- -1.7.0.1 - diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 5d944e6..4b8b12e 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -5,23 +5,15 @@ %global __find_provides %{_mingw32_findprovides} Name: mingw32-libpng -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.8 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ -Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2 +Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.xz Patch2: mingw32-libpng-fix-invalid-exports.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=717510 -# https://bugzilla.redhat.com/show_bug.cgi?id=717511 -# CVE-2011-2501 -# -# *** NOTE *** When updating the package, please ensure the -# new version either contains this fix, or this patch is retained. -Patch3: libpng-CVE-2011-2501.patch - Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,8 +41,6 @@ MinGW Windows Libpng library. # issue more to find out the real cause, but this will do for now %patch2 -p0 -%patch3 -p1 - %build %{_mingw32_configure} @@ -82,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/libpng14 %{_mingw32_includedir}/png.h %{_mingw32_includedir}/pngconf.h +%{_mingw32_libdir}/libpng.dll.a %{_mingw32_libdir}/libpng.la %{_mingw32_libdir}/libpng14.a %{_mingw32_libdir}/libpng14.dll.a @@ -91,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 22 2011 Kalev Lember - 1.4.8-1 +- Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) + * Wed Jun 29 2011 Richard W.M. Jones - 1.4.3-3 - Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). diff --git a/sources b/sources index 386932d..046b6f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9347eeda4241401f7da4dc9ba7f6a416 libpng-1.4.3.tar.bz2 +2ce595d571f2b06a9403ed5bcfa4ecbd libpng-1.4.8.tar.xz From c07ed8c1f2cd17999570c72e1c946c1a7764a7d7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Jul 2011 13:07:54 +0300 Subject: [PATCH 16/72] Generate debuginfo subpackage --- mingw32-libpng.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 4b8b12e..5c04260 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -3,6 +3,7 @@ %global _use_internal_dependency_generator 0 %global __find_requires %{_mingw32_findrequires} %global __find_provides %{_mingw32_findprovides} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-libpng Version: 1.4.8 @@ -30,6 +31,9 @@ Requires: pkgconfig MinGW Windows Libpng library. +%{?_mingw32_debug_package} + + %prep %setup -q -n libpng-%{version} @@ -84,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Jul 22 2011 Kalev Lember - 1.4.8-1 - Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) +- Generate debuginfo subpackage * Wed Jun 29 2011 Richard W.M. Jones - 1.4.3-3 - Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). From b6236ad3445bb4f2615736c9d1391f895d74653c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Jul 2011 13:09:32 +0300 Subject: [PATCH 17/72] Removed static libs from the main package If anyone needs the static libs, these should go into -static subpackage instead, along with libpng.a which wasn't properly packaged up earlier either. --- mingw32-libpng.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 5c04260..3cfcc7c 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -47,7 +47,7 @@ MinGW Windows Libpng library. %build -%{_mingw32_configure} +%{_mingw32_configure} --disable-static make @@ -56,8 +56,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a - # No need to distribute manpages which appear in the Fedora # native packages already. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} @@ -78,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/pngconf.h %{_mingw32_libdir}/libpng.dll.a %{_mingw32_libdir}/libpng.la -%{_mingw32_libdir}/libpng14.a %{_mingw32_libdir}/libpng14.dll.a %{_mingw32_libdir}/libpng14.la %{_mingw32_libdir}/pkgconfig/libpng.pc @@ -89,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jul 22 2011 Kalev Lember - 1.4.8-1 - Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) - Generate debuginfo subpackage +- Removed static libs from the main package * Wed Jun 29 2011 Richard W.M. Jones - 1.4.3-3 - Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). From a5e9f8ec0689a24e9125bb92c69ca1d0351ad4fe Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Jul 2011 13:11:15 +0300 Subject: [PATCH 18/72] Spec cleanup Dropped unused patches, switched to using automatic mingw dep extraction, and removed boilerplate code that isn't needed with current rpmbuild. Also dropped mingw32-libpng-fix-invalid-exports.patch, which doesn't appear to be needed any more. --- libpng-multilib.patch | 23 ------------- libpng-pngconf.patch | 42 ------------------------ mingw32-libpng-fix-invalid-exports.patch | 14 -------- mingw32-libpng.spec | 25 ++------------ 4 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 libpng-multilib.patch delete mode 100644 libpng-pngconf.patch delete mode 100644 mingw32-libpng-fix-invalid-exports.patch diff --git a/libpng-multilib.patch b/libpng-multilib.patch deleted file mode 100644 index 8b10eb9..0000000 --- a/libpng-multilib.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use pkg-config to report libpng version and installation directories. - - -diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in ---- libpng-1.2.31.orig/scripts/libpng-config.in 2008-05-29 13:37:58.000000000 -0400 -+++ libpng-1.2.31/scripts/libpng-config.in 2008-08-23 16:57:20.000000000 -0400 -@@ -8,11 +8,11 @@ - - # Modeled after libxml-config. - --version="@PNGLIB_VERSION@" --prefix="@prefix@" --exec_prefix="@exec_prefix@" --libdir="@libdir@" --includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" -+version=`pkg-config --modversion libpng` -+prefix=`pkg-config --variable prefix libpng` -+exec_prefix=`pkg-config --variable exec_prefix libpng` -+libdir=`pkg-config --variable libdir libpng` -+includedir=`pkg-config --variable includedir libpng` - libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" - all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" - I_opts="-I${includedir}" diff --git a/libpng-pngconf.patch b/libpng-pngconf.patch deleted file mode 100644 index dbaadcb..0000000 --- a/libpng-pngconf.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac ---- libpng-1.2.29.orig/configure.ac 2008-05-08 07:58:11.000000000 -0400 -+++ libpng-1.2.29/configure.ac 2008-05-31 20:21:12.000000000 -0400 -@@ -63,7 +63,8 @@ - AC_MSG_CHECKING( - [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE]) - AC_TRY_COMPILE( -- [#include "$srcdir/pnggccrd.c"], -+ [#define PNG_CONFIGURE_LIBPNG -+ #include "$srcdir/pnggccrd.c"], - [return 0;], - AC_MSG_RESULT(yes) - LIBPNG_NO_MMX="", -diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h ---- libpng-1.2.29.orig/pngconf.h 2008-05-08 07:58:03.000000000 -0400 -+++ libpng-1.2.29/pngconf.h 2008-05-31 20:21:12.000000000 -0400 -@@ -35,6 +35,25 @@ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -+#else -+/* pngconf.h is part of the exported API. When a libpng-using application -+ includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have -+ libpng's config.h available in this case. This means that we do not have the -+ defines added to config.h and the commandline by libpng's ./configure . -+ -+ For all defines from config.h not having them set is not a problem, however -+ ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling -+ on a platform on which the MMX and SSE asm code in libpng is not supported. -+ -+ We do need this define as this define is used to determine whether or not -+ to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines -+ and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications -+ (ImageMagick for example) to determine whether or not they can use the asm -+ functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms -+ on which the MMX and SSE asm code in libpng is not supported: */ -+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */ -+#define PNG_NO_ASSEMBLER_CODE -+#endif - #endif - - /* diff --git a/mingw32-libpng-fix-invalid-exports.patch b/mingw32-libpng-fix-invalid-exports.patch deleted file mode 100644 index f73c932..0000000 --- a/mingw32-libpng-fix-invalid-exports.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2009-11-20 01:18:09.926590381 +0100 -+++ configure 2009-11-20 01:18:37.352678377 +0100 -@@ -11447,10 +11447,7 @@ - if test "$have_ld_version_script" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5 - $as_echo_n "checking for symbol prefix... " >&6; } -- SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ -- | ${CPP-${CC-gcc} -E} - 2>&1 \ -- | ${EGREP-grep} "^PREFIX=" \ -- | ${SED-sed} "s:^PREFIX=::"` -+ SYMBOL_PREFIX="" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5 - $as_echo "$SYMBOL_PREFIX" >&6; } diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 3cfcc7c..4ec429d 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -1,8 +1,5 @@ %global __strip %{_mingw32_strip} %global __objdump %{_mingw32_objdump} -%global _use_internal_dependency_generator 0 -%global __find_requires %{_mingw32_findrequires} -%global __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-libpng @@ -13,14 +10,12 @@ Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.xz -Patch2: mingw32-libpng-fix-invalid-exports.patch Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 68 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-zlib @@ -37,23 +32,13 @@ MinGW Windows Libpng library. %prep %setup -q -n libpng-%{version} -# The configure script tries to generate a prefix which is used for -# symbol declarations. However, when this prefix is prefix is used -# the resulting DLL's don't have any exported symbols at all -# When we drop this prefix we retain backwards compatibility with -# older versions of mingw32-libpng. We might need to research this -# issue more to find out the real cause, but this will do for now -%patch2 -p0 - %build %{_mingw32_configure} --disable-static -make +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install # No need to distribute manpages which appear in the Fedora @@ -61,12 +46,7 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc ANNOUNCE CHANGES LICENSE README TODO %{_mingw32_bindir}/libpng-config %{_mingw32_bindir}/libpng14-14.dll @@ -87,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT - Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) - Generate debuginfo subpackage - Removed static libs from the main package +- Spec cleanup * Wed Jun 29 2011 Richard W.M. Jones - 1.4.3-3 - Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511). From a8457f822035baa38cca3dec8a530934f3afd955 Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Sat, 24 Dec 2011 20:51:56 +0600 Subject: [PATCH 19/72] static subpackage --- mingw32-libpng.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 4ec429d..9cbd88e 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -4,7 +4,7 @@ Name: mingw32-libpng Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -26,6 +26,16 @@ Requires: pkgconfig MinGW Windows Libpng library. +%package static +Summary: Static version of MinGW Windows Libpng library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +MinGW Windows Libpng library. + +This package contains static cross-compiled libraries. + %{?_mingw32_debug_package} @@ -34,7 +44,7 @@ MinGW Windows Libpng library. %build -%{_mingw32_configure} --disable-static +%{_mingw32_configure} make %{?_smp_mflags} @@ -61,8 +71,15 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %{_mingw32_libdir}/pkgconfig/libpng.pc %{_mingw32_libdir}/pkgconfig/libpng14.pc +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libpng.a +%{_mingw32_libdir}/libpng14.a %changelog +* Sat Dec 24 2011 Ivan Romanov - 1.4.8-2 +- New static subpackage + * Fri Jul 22 2011 Kalev Lember - 1.4.8-1 - Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692) - Generate debuginfo subpackage From ee4383d4447d6d1e41fcb33b9451d756d733416d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:03:17 -0600 Subject: [PATCH 20/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mingw32-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 9cbd88e..e51961f 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -4,7 +4,7 @@ Name: mingw32-libpng Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %{_mingw32_libdir}/libpng14.a %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.4.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Dec 24 2011 Ivan Romanov - 1.4.8-2 - New static subpackage From 268189135e1e372ebdc557a84b310b611bd8b793 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 31 Jan 2012 18:08:03 +0100 Subject: [PATCH 21/72] Update to 1.5.7 - Update to 1.5.7 - Dropped .la files --- .gitignore | 1 + mingw32-libpng.spec | 27 ++++++++++++++++----------- sources | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c807b4b..734cdbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libpng-1.4.3.tar.bz2 /libpng-1.4.8.tar.xz +/libpng-1.5.7.tar.xz diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index e51961f..9dfbb3e 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -3,8 +3,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-libpng -Version: 1.4.8 -Release: 3%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -51,6 +51,9 @@ make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install +# Drop all .la files +find $RPM_BUILD_ROOT -name "*.la" -delete + # No need to distribute manpages which appear in the Fedora # native packages already. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} @@ -59,24 +62,26 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %files %doc ANNOUNCE CHANGES LICENSE README TODO %{_mingw32_bindir}/libpng-config -%{_mingw32_bindir}/libpng14-14.dll -%{_mingw32_bindir}/libpng14-config -%{_mingw32_includedir}/libpng14 +%{_mingw32_bindir}/libpng15-15.dll +%{_mingw32_bindir}/libpng15-config +%{_mingw32_includedir}/libpng15 %{_mingw32_includedir}/png.h %{_mingw32_includedir}/pngconf.h +%{_mingw32_includedir}/pnglibconf.h %{_mingw32_libdir}/libpng.dll.a -%{_mingw32_libdir}/libpng.la -%{_mingw32_libdir}/libpng14.dll.a -%{_mingw32_libdir}/libpng14.la +%{_mingw32_libdir}/libpng15.dll.a %{_mingw32_libdir}/pkgconfig/libpng.pc -%{_mingw32_libdir}/pkgconfig/libpng14.pc +%{_mingw32_libdir}/pkgconfig/libpng15.pc %files static -%defattr(-,root,root,-) %{_mingw32_libdir}/libpng.a -%{_mingw32_libdir}/libpng14.a +%{_mingw32_libdir}/libpng15.a %changelog +* Tue Jan 31 2012 Erik van Pienbroek - 1.5.7-1 +- Update to 1.5.7 +- Dropped .la files + * Fri Jan 13 2012 Fedora Release Engineering - 1.4.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 046b6f5..c3b4e96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ce595d571f2b06a9403ed5bcfa4ecbd libpng-1.4.8.tar.xz +c3ae9ce4e81ec0aafdd4ac961586ee0d libpng-1.5.7.tar.xz From 647495f04c287ed285cdb2a829784d0468a2be89 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Feb 2012 21:36:21 +0100 Subject: [PATCH 22/72] Rebuild against the mingw-w64 toolchain --- mingw32-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec index 9dfbb3e..97f365d 100644 --- a/mingw32-libpng.spec +++ b/mingw32-libpng.spec @@ -4,7 +4,7 @@ Name: mingw32-libpng Version: 1.5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %{_mingw32_libdir}/libpng15.a %changelog +* Mon Feb 27 2012 Erik van Pienbroek - 1.5.7-2 +- Rebuild against the mingw-w64 toolchain + * Tue Jan 31 2012 Erik van Pienbroek - 1.5.7-1 - Update to 1.5.7 - Dropped .la files From 4d03633bd86ac9c84a7a6487e78154bc610b6f37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 6 Mar 2012 14:11:06 +0000 Subject: [PATCH 23/72] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From b66b8a013b4c0189e78126a9442705301cec78d7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2012 21:23:16 +0200 Subject: [PATCH 24/72] Renamed the source package to mingw-libpng (#800430) --- mingw32-libpng.spec => mingw-libpng.spec | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) rename mingw32-libpng.spec => mingw-libpng.spec (90%) diff --git a/mingw32-libpng.spec b/mingw-libpng.spec similarity index 90% rename from mingw32-libpng.spec rename to mingw-libpng.spec index 97f365d..8d0c34f 100644 --- a/mingw32-libpng.spec +++ b/mingw-libpng.spec @@ -2,9 +2,9 @@ %global __objdump %{_mingw32_objdump} %define __debug_install_post %{_mingw32_debug_install_post} -Name: mingw32-libpng +Name: mingw-libpng Version: 1.5.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -20,18 +20,24 @@ BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-zlib +%description +MinGW Windows Libpng library. + + +%package -n mingw32-libpng +Summary: MinGW Windows Libpng library Requires: pkgconfig -%description +%description -n mingw32-libpng MinGW Windows Libpng library. -%package static +%package -n mingw32-libpng-static Summary: Static version of MinGW Windows Libpng library -Requires: %{name} = %{version}-%{release} +Requires: mingw32-libpng = %{version}-%{release} Group: Development/Libraries -%description static +%description -n mingw32-libpng-static MinGW Windows Libpng library. This package contains static cross-compiled libraries. @@ -59,7 +65,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} -%files +%files -n mingw32-libpng %doc ANNOUNCE CHANGES LICENSE README TODO %{_mingw32_bindir}/libpng-config %{_mingw32_bindir}/libpng15-15.dll @@ -73,11 +79,14 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %{_mingw32_libdir}/pkgconfig/libpng.pc %{_mingw32_libdir}/pkgconfig/libpng15.pc -%files static +%files -n mingw32-libpng-static %{_mingw32_libdir}/libpng.a %{_mingw32_libdir}/libpng15.a %changelog +* Tue Mar 06 2012 Kalev Lember - 1.5.7-3 +- Renamed the source package to mingw-libpng (#800430) + * Mon Feb 27 2012 Erik van Pienbroek - 1.5.7-2 - Rebuild against the mingw-w64 toolchain From 1a8bc33869f67bc754bc988362a5c81253505306 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2012 21:24:01 +0200 Subject: [PATCH 25/72] Use mingw macros without leading underscore --- mingw-libpng.spec | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 8d0c34f..22941e4 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,6 +1,6 @@ -%global __strip %{_mingw32_strip} -%global __objdump %{_mingw32_objdump} -%define __debug_install_post %{_mingw32_debug_install_post} +%global __strip %{mingw32_strip} +%global __objdump %{mingw32_objdump} +%define __debug_install_post %{mingw32_debug_install_post} Name: mingw-libpng Version: 1.5.7 @@ -42,7 +42,7 @@ MinGW Windows Libpng library. This package contains static cross-compiled libraries. -%{?_mingw32_debug_package} +%{?mingw32_debug_package} %prep @@ -50,7 +50,7 @@ This package contains static cross-compiled libraries. %build -%{_mingw32_configure} +%{mingw32_configure} make %{?_smp_mflags} @@ -62,30 +62,31 @@ find $RPM_BUILD_ROOT -name "*.la" -delete # No need to distribute manpages which appear in the Fedora # native packages already. -rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} %files -n mingw32-libpng %doc ANNOUNCE CHANGES LICENSE README TODO -%{_mingw32_bindir}/libpng-config -%{_mingw32_bindir}/libpng15-15.dll -%{_mingw32_bindir}/libpng15-config -%{_mingw32_includedir}/libpng15 -%{_mingw32_includedir}/png.h -%{_mingw32_includedir}/pngconf.h -%{_mingw32_includedir}/pnglibconf.h -%{_mingw32_libdir}/libpng.dll.a -%{_mingw32_libdir}/libpng15.dll.a -%{_mingw32_libdir}/pkgconfig/libpng.pc -%{_mingw32_libdir}/pkgconfig/libpng15.pc +%{mingw32_bindir}/libpng-config +%{mingw32_bindir}/libpng15-15.dll +%{mingw32_bindir}/libpng15-config +%{mingw32_includedir}/libpng15 +%{mingw32_includedir}/png.h +%{mingw32_includedir}/pngconf.h +%{mingw32_includedir}/pnglibconf.h +%{mingw32_libdir}/libpng.dll.a +%{mingw32_libdir}/libpng15.dll.a +%{mingw32_libdir}/pkgconfig/libpng.pc +%{mingw32_libdir}/pkgconfig/libpng15.pc %files -n mingw32-libpng-static -%{_mingw32_libdir}/libpng.a -%{_mingw32_libdir}/libpng15.a +%{mingw32_libdir}/libpng.a +%{mingw32_libdir}/libpng15.a %changelog * Tue Mar 06 2012 Kalev Lember - 1.5.7-3 - Renamed the source package to mingw-libpng (#800430) +- Use mingw macros without leading underscore * Mon Feb 27 2012 Erik van Pienbroek - 1.5.7-2 - Rebuild against the mingw-w64 toolchain From f4fa1252ae34dea3e3c6a2a43cc36fc9d40633e9 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 10 Mar 2012 19:45:53 +0100 Subject: [PATCH 26/72] Added win64 support --- mingw-libpng.spec | 71 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 22941e4..ba96369 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,10 +1,11 @@ -%global __strip %{mingw32_strip} -%global __objdump %{mingw32_objdump} -%define __debug_install_post %{mingw32_debug_install_post} +%?mingw_package_header + +%global mingw_build_win32 1 +%global mingw_build_win64 1 Name: mingw-libpng Version: 1.5.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -15,15 +16,22 @@ Group: Development/Libraries BuildArch: noarch -BuildRequires: mingw32-filesystem >= 68 +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-zlib + +BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-zlib + %description MinGW Windows Libpng library. +# Win32 %package -n mingw32-libpng Summary: MinGW Windows Libpng library Requires: pkgconfig @@ -31,7 +39,6 @@ Requires: pkgconfig %description -n mingw32-libpng MinGW Windows Libpng library. - %package -n mingw32-libpng-static Summary: Static version of MinGW Windows Libpng library Requires: mingw32-libpng = %{version}-%{release} @@ -42,7 +49,26 @@ MinGW Windows Libpng library. This package contains static cross-compiled libraries. -%{?mingw32_debug_package} +# Win64 +%package -n mingw64-libpng +Summary: MinGW Windows Libpng library +Requires: pkgconfig + +%description -n mingw64-libpng +MinGW Windows Libpng library. + +%package -n mingw64-libpng-static +Summary: Static version of MinGW Windows Libpng library +Requires: mingw64-libpng = %{version}-%{release} +Group: Development/Libraries + +%description -n mingw64-libpng-static +MinGW Windows Libpng library. + +This package contains static cross-compiled libraries. + + +%?mingw_debug_package %prep @@ -50,12 +76,12 @@ This package contains static cross-compiled libraries. %build -%{mingw32_configure} -make %{?_smp_mflags} +%mingw_configure +%mingw_make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +%mingw_make_install DESTDIR=$RPM_BUILD_ROOT # Drop all .la files find $RPM_BUILD_ROOT -name "*.la" -delete @@ -63,8 +89,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete # No need to distribute manpages which appear in the Fedora # native packages already. rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} +# Win32 %files -n mingw32-libpng %doc ANNOUNCE CHANGES LICENSE README TODO %{mingw32_bindir}/libpng-config @@ -83,7 +111,30 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} %{mingw32_libdir}/libpng.a %{mingw32_libdir}/libpng15.a +# Win64 +%files -n mingw64-libpng +%doc ANNOUNCE CHANGES LICENSE README TODO +%{mingw64_bindir}/libpng-config +%{mingw64_bindir}/libpng15-15.dll +%{mingw64_bindir}/libpng15-config +%{mingw64_includedir}/libpng15 +%{mingw64_includedir}/png.h +%{mingw64_includedir}/pngconf.h +%{mingw64_includedir}/pnglibconf.h +%{mingw64_libdir}/libpng.dll.a +%{mingw64_libdir}/libpng15.dll.a +%{mingw64_libdir}/pkgconfig/libpng.pc +%{mingw64_libdir}/pkgconfig/libpng15.pc + +%files -n mingw64-libpng-static +%{mingw64_libdir}/libpng.a +%{mingw64_libdir}/libpng15.a + + %changelog +* Sat Mar 10 2012 Erik van Pienbroek - 1.5.7-4 +- Added win64 support + * Tue Mar 06 2012 Kalev Lember - 1.5.7-3 - Renamed the source package to mingw-libpng (#800430) - Use mingw macros without leading underscore From 022f69c38cfe0162c21a806fad0ffa52474b11d8 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 10 Mar 2012 20:03:45 +0100 Subject: [PATCH 27/72] Use correct BuildRequires --- mingw-libpng.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index ba96369..9a26ebe 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -21,10 +21,10 @@ BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-zlib -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-zlib +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +BuildRequires: mingw64-binutils +BuildRequires: mingw64-zlib %description From 8903fce26694de4103c71893524c8c78c2a6047a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 20:32:14 -0500 Subject: [PATCH 28/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 9a26ebe..e93512b 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -5,7 +5,7 @@ Name: mingw-libpng Version: 1.5.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 1.5.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Mar 10 2012 Erik van Pienbroek - 1.5.7-4 - Added win64 support From a4650bf807fec13650079de9a0595c6801d537e8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 7 Oct 2012 14:31:00 +0200 Subject: [PATCH 29/72] Update to 1.5.13 (CVE-2011-3464) https://bugzilla.redhat.com/show_bug.cgi?id=843190 --- .gitignore | 1 + mingw-libpng.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 734cdbe..c017c52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.4.8.tar.xz /libpng-1.5.7.tar.xz +/libpng-1.5.13.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index e93512b..cd6bae4 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,11 +1,8 @@ %?mingw_package_header -%global mingw_build_win32 1 -%global mingw_build_win64 1 - Name: mingw-libpng -Version: 1.5.7 -Release: 5%{?dist} +Version: 1.5.13 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -132,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sun Oct 07 2012 Kalev Lember - 1.5.13-1 +- Update to 1.5.13 (CVE-2011-3464) + * Fri Jul 20 2012 Fedora Release Engineering - 1.5.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index c3b4e96..8f3ada3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3ae9ce4e81ec0aafdd4ac961586ee0d libpng-1.5.7.tar.xz +0b607a685da977f1bfc96e1c47055183 libpng-1.5.13.tar.xz From 0858d7ed9da7a7070a8e9b96c2a1f3ce074b410a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 01:06:08 -0600 Subject: [PATCH 30/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index cd6bae4..4619a15 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.5.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.5.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Oct 07 2012 Kalev Lember - 1.5.13-1 - Update to 1.5.13 (CVE-2011-3464) From afd72b634f9f32093c185c8c86ada55eafdc336e Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 13 Jul 2013 23:19:29 +0200 Subject: [PATCH 31/72] Update to 1.6.2 --- .gitignore | 1 + mingw-libpng.spec | 33 ++++++++++++++++++--------------- sources | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c017c52..bafa0db 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.4.8.tar.xz /libpng-1.5.7.tar.xz /libpng-1.5.13.tar.xz +/libpng-1.6.2.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 4619a15..3dde67b 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,13 +1,13 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.5.13 -Release: 2%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ -Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.xz +Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz Group: Development/Libraries @@ -93,42 +93,45 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %files -n mingw32-libpng %doc ANNOUNCE CHANGES LICENSE README TODO %{mingw32_bindir}/libpng-config -%{mingw32_bindir}/libpng15-15.dll -%{mingw32_bindir}/libpng15-config -%{mingw32_includedir}/libpng15 +%{mingw32_bindir}/libpng16-16.dll +%{mingw32_bindir}/libpng16-config +%{mingw32_includedir}/libpng16 %{mingw32_includedir}/png.h %{mingw32_includedir}/pngconf.h %{mingw32_includedir}/pnglibconf.h %{mingw32_libdir}/libpng.dll.a -%{mingw32_libdir}/libpng15.dll.a +%{mingw32_libdir}/libpng16.dll.a %{mingw32_libdir}/pkgconfig/libpng.pc -%{mingw32_libdir}/pkgconfig/libpng15.pc +%{mingw32_libdir}/pkgconfig/libpng16.pc %files -n mingw32-libpng-static %{mingw32_libdir}/libpng.a -%{mingw32_libdir}/libpng15.a +%{mingw32_libdir}/libpng16.a # Win64 %files -n mingw64-libpng %doc ANNOUNCE CHANGES LICENSE README TODO %{mingw64_bindir}/libpng-config -%{mingw64_bindir}/libpng15-15.dll -%{mingw64_bindir}/libpng15-config -%{mingw64_includedir}/libpng15 +%{mingw64_bindir}/libpng16-16.dll +%{mingw64_bindir}/libpng16-config +%{mingw64_includedir}/libpng16 %{mingw64_includedir}/png.h %{mingw64_includedir}/pngconf.h %{mingw64_includedir}/pnglibconf.h %{mingw64_libdir}/libpng.dll.a -%{mingw64_libdir}/libpng15.dll.a +%{mingw64_libdir}/libpng16.dll.a %{mingw64_libdir}/pkgconfig/libpng.pc -%{mingw64_libdir}/pkgconfig/libpng15.pc +%{mingw64_libdir}/pkgconfig/libpng16.pc %files -n mingw64-libpng-static %{mingw64_libdir}/libpng.a -%{mingw64_libdir}/libpng15.a +%{mingw64_libdir}/libpng16.a %changelog +* Sat Jul 13 2013 Erik van Pienbroek - 1.6.2-1 +- Update to 1.6.2 + * Thu Feb 14 2013 Fedora Release Engineering - 1.5.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 8f3ada3..71b123e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b607a685da977f1bfc96e1c47055183 libpng-1.5.13.tar.xz +9d838f6fca9948a9f360a0cc1b516d5f libpng-1.6.2.tar.xz From 5448998ca4fd46292792a24ef9083e4f5be26923 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 05:51:09 -0500 Subject: [PATCH 32/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 3dde67b..87da41e 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Jul 13 2013 Erik van Pienbroek - 1.6.2-1 - Update to 1.6.2 From af6a80bab2e4a6470e19ddeba604cdbef231864a Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 7 Sep 2013 21:13:32 +0200 Subject: [PATCH 33/72] Update to 1.6.3 --- .gitignore | 1 + mingw-libpng.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bafa0db..88359c2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.5.7.tar.xz /libpng-1.5.13.tar.xz /libpng-1.6.2.tar.xz +/libpng-1.6.3.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 87da41e..47fd73f 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -95,6 +95,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw32_bindir}/libpng-config %{mingw32_bindir}/libpng16-16.dll %{mingw32_bindir}/libpng16-config +%{mingw32_bindir}/png-fix-itxt.exe +%{mingw32_bindir}/pngfix.exe %{mingw32_includedir}/libpng16 %{mingw32_includedir}/png.h %{mingw32_includedir}/pngconf.h @@ -114,6 +116,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw64_bindir}/libpng-config %{mingw64_bindir}/libpng16-16.dll %{mingw64_bindir}/libpng16-config +%{mingw64_bindir}/png-fix-itxt.exe +%{mingw64_bindir}/pngfix.exe %{mingw64_includedir}/libpng16 %{mingw64_includedir}/png.h %{mingw64_includedir}/pngconf.h @@ -129,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sat Sep 7 2013 Erik van Pienbroek - 1.6.3-1 +- Update to 1.6.3 + * Sat Aug 03 2013 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 71b123e..8429e98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d838f6fca9948a9f360a0cc1b516d5f libpng-1.6.2.tar.xz +9307f8ab04f4be3c1889ffb504f0fe5c libpng-1.6.3.tar.xz From a109a547e9351faae446f2b0a7827b50b0e88932 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Nov 2013 16:19:04 +0000 Subject: [PATCH 34/72] Copy comment about non-current tarball location from libpng.spec. --- mingw-libpng.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 47fd73f..742d37d 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -7,6 +7,8 @@ Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ +# Note: non-current tarballs get moved to the history/ subdirectory, +# so look there if you fail to retrieve the version you want Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz Group: Development/Libraries From 13267ea59c41afed0e5475ab7409509605ecbd3a Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 20 Nov 2013 21:13:36 +0100 Subject: [PATCH 35/72] Update to 1.6.7 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 88359c2..49b64e0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.5.13.tar.xz /libpng-1.6.2.tar.xz /libpng-1.6.3.tar.xz +/libpng-1.6.7.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 742d37d..505730c 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.3 +Version: 1.6.7 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Nov 20 2013 Erik van Pienbroek - 1.6.7-1 +- Update to 1.6.7 + * Sat Sep 7 2013 Erik van Pienbroek - 1.6.3-1 - Update to 1.6.3 diff --git a/sources b/sources index 8429e98..0ffbe22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9307f8ab04f4be3c1889ffb504f0fe5c libpng-1.6.3.tar.xz +7023a9eacd7b6a3eb95761a2f574d456 libpng-1.6.7.tar.xz From 3f5f16b70ca0307738a022751e6da50ad9f3ce01 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 29 Mar 2014 19:24:39 +0100 Subject: [PATCH 36/72] Update to 1.6.10 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49b64e0..0409a1c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.2.tar.xz /libpng-1.6.3.tar.xz /libpng-1.6.7.tar.xz +/libpng-1.6.10.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 505730c..edff413 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.7 +Version: 1.6.10 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sat Mar 29 2014 Kalev Lember - 1.6.10-1 +- Update to 1.6.10 + * Wed Nov 20 2013 Erik van Pienbroek - 1.6.7-1 - Update to 1.6.7 diff --git a/sources b/sources index 0ffbe22..85c2f82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7023a9eacd7b6a3eb95761a2f574d456 libpng-1.6.7.tar.xz +5f414b20f683b1d96b163c89e3eff768 libpng-1.6.10.tar.xz From cdfedd983fce9bc6cc266b542ac2ccee31d959e1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 04:56:28 -0500 Subject: [PATCH 37/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index edff413..45002ad 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Mar 29 2014 Kalev Lember - 1.6.10-1 - Update to 1.6.10 From 04b9682b641476b1975c0bf241ad2f5da0fa1b05 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:26:54 +0000 Subject: [PATCH 38/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 45002ad..f3246fa 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.6.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 65491d84ba10a38b5a68617beee70d75558a09ee Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 19 Nov 2015 11:10:26 +0100 Subject: [PATCH 39/72] Update to 1.6.19 --- .gitignore | 1 + mingw-libpng.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0409a1c..2c7d211 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.3.tar.xz /libpng-1.6.7.tar.xz /libpng-1.6.10.tar.xz +/libpng-1.6.19.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index f3246fa..088e912 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.10 -Release: 3%{?dist} +Version: 1.6.19 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Thu Nov 19 2015 Kalev Lember - 1.6.19-1 +- Update to 1.6.19 + * Wed Jun 17 2015 Fedora Release Engineering - 1.6.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 85c2f82..36b550e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f414b20f683b1d96b163c89e3eff768 libpng-1.6.10.tar.xz +1e6a458429e850fc93c1f3b6dc00a48f libpng-1.6.19.tar.xz From d3ccc758dbfd8c73d7f20279beb2fb13a05f13b6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 19 Nov 2015 11:26:04 +0100 Subject: [PATCH 40/72] Use license macro for license files --- mingw-libpng.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 088e912..292c529 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -93,7 +93,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} # Win32 %files -n mingw32-libpng -%doc ANNOUNCE CHANGES LICENSE README TODO +%license LICENSE +%doc ANNOUNCE CHANGES README TODO %{mingw32_bindir}/libpng-config %{mingw32_bindir}/libpng16-16.dll %{mingw32_bindir}/libpng16-config @@ -114,7 +115,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} # Win64 %files -n mingw64-libpng -%doc ANNOUNCE CHANGES LICENSE README TODO +%license LICENSE +%doc ANNOUNCE CHANGES README TODO %{mingw64_bindir}/libpng-config %{mingw64_bindir}/libpng16-16.dll %{mingw64_bindir}/libpng16-config From 6af4fe99a225de3af88afc49f9096848976eeb07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:16:12 +0000 Subject: [PATCH 41/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 292c529..a4fe559 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.6.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Nov 19 2015 Kalev Lember - 1.6.19-1 - Update to 1.6.19 From 98424e87aba26eea9310dcecd07ed4866159c1b7 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 6 Feb 2016 18:01:02 +0100 Subject: [PATCH 42/72] Update to 1.6.21 --- .gitignore | 1 + mingw-libpng.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c7d211..7397ac8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.7.tar.xz /libpng-1.6.10.tar.xz /libpng-1.6.19.tar.xz +/libpng-1.6.21.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index a4fe559..7ae5233 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.19 -Release: 2%{?dist} +Version: 1.6.21 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -137,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sat Feb 6 2016 Erik van Pienbroek - 1.6.21-1 +- Update to 1.6.21 +- Fixes various CVE's (RHBZ #1281760, #1281756) + * Thu Feb 04 2016 Fedora Release Engineering - 1.6.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 36b550e..8e4c978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e6a458429e850fc93c1f3b6dc00a48f libpng-1.6.19.tar.xz +3bacb4728f6694a64ad9052769d6a4ce libpng-1.6.21.tar.xz From 486efa1057ebf4a3836e87ed3c4afd2b73488ca8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 15 Jun 2016 10:27:21 +0200 Subject: [PATCH 43/72] Update to 1.6.23 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7397ac8..b6ac1ba 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.10.tar.xz /libpng-1.6.19.tar.xz /libpng-1.6.21.tar.xz +/libpng-1.6.23.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 7ae5233..4a004d8 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.21 +Version: 1.6.23 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Jun 15 2016 Kalev Lember - 1.6.23-1 +- Update to 1.6.23 + * Sat Feb 6 2016 Erik van Pienbroek - 1.6.21-1 - Update to 1.6.21 - Fixes various CVE's (RHBZ #1281760, #1281756) diff --git a/sources b/sources index 8e4c978..4e173f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bacb4728f6694a64ad9052769d6a4ce libpng-1.6.21.tar.xz +9b320a05ed4db1f3f0865c8a951fd9aa libpng-1.6.23.tar.xz From e383c6bb57403ebb8ce22f63f0b8b32319e9c33c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Aug 2016 15:40:51 +0200 Subject: [PATCH 44/72] Update to 1.6.24 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6ac1ba..2b41f3d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.19.tar.xz /libpng-1.6.21.tar.xz /libpng-1.6.23.tar.xz +/libpng-1.6.24.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 4a004d8..c8731a2 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.23 +Version: 1.6.24 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Mon Aug 08 2016 Kalev Lember - 1.6.24-1 +- Update to 1.6.24 + * Wed Jun 15 2016 Kalev Lember - 1.6.23-1 - Update to 1.6.23 diff --git a/sources b/sources index 4e173f7..803ef01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b320a05ed4db1f3f0865c8a951fd9aa libpng-1.6.23.tar.xz +ffcdbd549814787fa8010c372e35ff25 libpng-1.6.24.tar.xz From 468be5d2848610e07fe7d3defeb25bcc82c1ed99 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Aug 2016 15:51:03 +0200 Subject: [PATCH 45/72] Update files list --- mingw-libpng.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index c8731a2..aeee9e2 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -99,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw32_bindir}/libpng16-16.dll %{mingw32_bindir}/libpng16-config %{mingw32_bindir}/png-fix-itxt.exe +%{mingw32_bindir}/pngcp.exe %{mingw32_bindir}/pngfix.exe %{mingw32_includedir}/libpng16 %{mingw32_includedir}/png.h @@ -121,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw64_bindir}/libpng16-16.dll %{mingw64_bindir}/libpng16-config %{mingw64_bindir}/png-fix-itxt.exe +%{mingw64_bindir}/pngcp.exe %{mingw64_bindir}/pngfix.exe %{mingw64_includedir}/libpng16 %{mingw64_includedir}/png.h From 2468903e792830316dd0b3e82b429c7914eeeb52 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 16 Oct 2016 16:19:13 +0200 Subject: [PATCH 46/72] Update to 1.6.25 --- .gitignore | 1 + mingw-libpng.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2b41f3d..6f8d8c7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.21.tar.xz /libpng-1.6.23.tar.xz /libpng-1.6.24.tar.xz +/libpng-1.6.25.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index aeee9e2..fd70b2b 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.24 +Version: 1.6.25 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -99,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw32_bindir}/libpng16-16.dll %{mingw32_bindir}/libpng16-config %{mingw32_bindir}/png-fix-itxt.exe -%{mingw32_bindir}/pngcp.exe %{mingw32_bindir}/pngfix.exe %{mingw32_includedir}/libpng16 %{mingw32_includedir}/png.h @@ -122,7 +121,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %{mingw64_bindir}/libpng16-16.dll %{mingw64_bindir}/libpng16-config %{mingw64_bindir}/png-fix-itxt.exe -%{mingw64_bindir}/pngcp.exe %{mingw64_bindir}/pngfix.exe %{mingw64_includedir}/libpng16 %{mingw64_includedir}/png.h @@ -139,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Sun Oct 16 2016 Kalev Lember - 1.6.25-1 +- Update to 1.6.25 + * Mon Aug 08 2016 Kalev Lember - 1.6.24-1 - Update to 1.6.24 diff --git a/sources b/sources index 803ef01..0bcdede 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffcdbd549814787fa8010c372e35ff25 libpng-1.6.24.tar.xz +0cb72ef57a576bfed1b6cb4b5a09b554 libpng-1.6.25.tar.xz From e7bcd3cad5027eea9603e6a755b38e7dbb67fa50 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 25 Oct 2016 13:41:44 +0200 Subject: [PATCH 47/72] Update to 1.6.26 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6f8d8c7..fd829a2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.23.tar.xz /libpng-1.6.24.tar.xz /libpng-1.6.25.tar.xz +/libpng-1.6.26.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index fd70b2b..d1437df 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.25 +Version: 1.6.26 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Tue Oct 25 2016 Kalev Lember - 1.6.26-1 +- Update to 1.6.26 + * Sun Oct 16 2016 Kalev Lember - 1.6.25-1 - Update to 1.6.25 diff --git a/sources b/sources index 0bcdede..e6d34e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cb72ef57a576bfed1b6cb4b5a09b554 libpng-1.6.25.tar.xz +faed9bb495d2e12dd0c9ec561ca60cd8 libpng-1.6.26.tar.xz From 132e372e2409f1877d8bb41641eed38c9d1eafec Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 25 Oct 2016 13:42:34 +0200 Subject: [PATCH 48/72] Don't set group tags They are unused in Fedora. --- mingw-libpng.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index d1437df..9515cbb 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -11,8 +11,6 @@ URL: http://www.libpng.org/pub/png/ # so look there if you fail to retrieve the version you want Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz -Group: Development/Libraries - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -139,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog * Tue Oct 25 2016 Kalev Lember - 1.6.26-1 - Update to 1.6.26 +- Don't set group tags * Sun Oct 16 2016 Kalev Lember - 1.6.25-1 - Update to 1.6.25 From fa80ca3d08ea0313c22b974ae2149ea13c4da0b7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 25 Oct 2016 13:43:18 +0200 Subject: [PATCH 49/72] Drop two more group tags --- mingw-libpng.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 9515cbb..1d9226b 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -39,7 +39,6 @@ MinGW Windows Libpng library. %package -n mingw32-libpng-static Summary: Static version of MinGW Windows Libpng library Requires: mingw32-libpng = %{version}-%{release} -Group: Development/Libraries %description -n mingw32-libpng-static MinGW Windows Libpng library. @@ -57,7 +56,6 @@ MinGW Windows Libpng library. %package -n mingw64-libpng-static Summary: Static version of MinGW Windows Libpng library Requires: mingw64-libpng = %{version}-%{release} -Group: Development/Libraries %description -n mingw64-libpng-static MinGW Windows Libpng library. From 72a93cbe44568147f725a37309bc1b38e1b9268b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 30 Dec 2016 16:53:44 +0100 Subject: [PATCH 50/72] Update to 1.6.27 --- .gitignore | 1 + mingw-libpng.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd829a2..d476b40 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.24.tar.xz /libpng-1.6.25.tar.xz /libpng-1.6.26.tar.xz +/libpng-1.6.27.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 1d9226b..f52cc20 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.26 +Version: 1.6.27 Release: 1%{?dist} Summary: MinGW Windows Libpng library @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Dec 30 2016 Kalev Lember - 1.6.27-1 +- Update to 1.6.27 + * Tue Oct 25 2016 Kalev Lember - 1.6.26-1 - Update to 1.6.26 - Don't set group tags diff --git a/sources b/sources index e6d34e2..13f6d77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -faed9bb495d2e12dd0c9ec561ca60cd8 libpng-1.6.26.tar.xz +SHA512 (libpng-1.6.27.tar.xz) = 9dcf54147fa2637a72364246e8565c0a6d25e4313f26150689b166eabd4358177e1caf38ff622b04c71f3b7cfd550f7fd6ca87892c50203a63b92f365fc7c8d7 From c3a888cefe25d45f9392674a119099ca5375b479 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:12:04 +0000 Subject: [PATCH 51/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index f52cc20..17448ed 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.6.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Dec 30 2016 Kalev Lember - 1.6.27-1 - Update to 1.6.27 From aa996249a62426d5c6e0556c85a1bc37812ea865 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Jun 2017 12:15:49 +0200 Subject: [PATCH 52/72] Update to 1.6.29 --- .gitignore | 1 + mingw-libpng.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d476b40..3b8913a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.25.tar.xz /libpng-1.6.26.tar.xz /libpng-1.6.27.tar.xz +/libpng-1.6.29.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 17448ed..a0de21c 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-libpng -Version: 1.6.27 -Release: 2%{?dist} +Version: 1.6.29 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Tue Jun 20 2017 Kalev Lember - 1.6.29-1 +- Update to 1.6.29 + * Fri Feb 10 2017 Fedora Release Engineering - 1.6.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 13f6d77..3bdac05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpng-1.6.27.tar.xz) = 9dcf54147fa2637a72364246e8565c0a6d25e4313f26150689b166eabd4358177e1caf38ff622b04c71f3b7cfd550f7fd6ca87892c50203a63b92f365fc7c8d7 +SHA512 (libpng-1.6.29.tar.xz) = 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc From b1a3c3267e4211bcb4d9313e51efa5ef44758c9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 21:41:23 +0000 Subject: [PATCH 53/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index a0de21c..a2b1701 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.6.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jun 20 2017 Kalev Lember - 1.6.29-1 - Update to 1.6.29 From 254d8c7fd6803659658d3b7e3733dac4817df360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 02:20:23 +0000 Subject: [PATCH 54/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index a2b1701..f303149 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.6.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.6.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e63e1d7b6f77922dba4f64442b8422b852717b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:29:55 +0000 Subject: [PATCH 55/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index f303149..190897b 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.29 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.6.29-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e424a5d89916159af9fb60e8378f747256973a40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:42:02 +0000 Subject: [PATCH 56/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 190897b..ddf7c7d 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.29 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.6.29-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d781e382c9233e5fbc5ffb17c655fc3f2ff65cf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:55:27 +0000 Subject: [PATCH 57/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index ddf7c7d..06d0d78 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.29 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.6.29-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 85c8b1516ec93633f3a503db8d7e2c63c44f07c1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 28 Aug 2019 18:10:30 +0200 Subject: [PATCH 58/72] Update to 1.6.37 --- .gitignore | 1 + mingw-libpng.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3b8913a..2e013ef 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libpng-1.4.3.tar.bz2 /libpng-1.6.26.tar.xz /libpng-1.6.27.tar.xz /libpng-1.6.29.tar.xz +/libpng-1.6.37.tar.xz diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 06d0d78..e73e6c7 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,8 +1,8 @@ -%?mingw_package_header +%{?mingw_package_header} Name: mingw-libpng -Version: 1.6.29 -Release: 6%{?dist} +Version: 1.6.37 +Release: 1%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -63,7 +63,7 @@ MinGW Windows Libpng library. This package contains static cross-compiled libraries. -%?mingw_debug_package +%{?mingw_debug_package} %prep @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Aug 28 2019 Sandro Mani - 1.6.37-1 +- Update to 1.6.37 + * Thu Jul 25 2019 Fedora Release Engineering - 1.6.29-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3bdac05..6b77392 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpng-1.6.29.tar.xz) = 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc +SHA512 (libpng-1.6.37.tar.xz) = 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 From e167b3b481cd685376060e1640d62a7322233524 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 8 Oct 2019 18:50:19 +0200 Subject: [PATCH 59/72] Rebuild (Changes/Mingw32GccDwarf2) --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index e73e6c7..1388b60 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Tue Oct 08 2019 Sandro Mani - 1.6.37-2 +- Rebuild (Changes/Mingw32GccDwarf2) + * Wed Aug 28 2019 Sandro Mani - 1.6.37-1 - Update to 1.6.37 From b5de7469e41d978ef921445c6b98302c4fc80885 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:11:37 +0000 Subject: [PATCH 60/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 1388b60..4ee482d 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.6.37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 08 2019 Sandro Mani - 1.6.37-2 - Rebuild (Changes/Mingw32GccDwarf2) From 9a8104c808d0745cfa66ba7f552612b060011172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:45:47 +0000 Subject: [PATCH 61/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 4ee482d..88defbf 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.6.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.6.37-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f5146e1503ae75c40e26da267e80c3cbcdac1388 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 13 Nov 2020 00:13:18 +0100 Subject: [PATCH 62/72] Switch to %mingw_make_{build,install} --- mingw-libpng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 88defbf..2556be7 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -72,7 +72,7 @@ This package contains static cross-compiled libraries. %build %mingw_configure -%mingw_make %{?_smp_mflags} +%mingw_make_build %install From aaad7d919b5e476cbd74407361792c233c9a9ab4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 13 Nov 2020 01:05:20 +0100 Subject: [PATCH 63/72] More spec cleanups --- mingw-libpng.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 2556be7..96fb519 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -67,7 +67,7 @@ This package contains static cross-compiled libraries. %prep -%setup -q -n libpng-%{version} +%autosetup -p1 -n libpng-%{version} %build @@ -76,15 +76,15 @@ This package contains static cross-compiled libraries. %install -%mingw_make_install DESTDIR=$RPM_BUILD_ROOT +%mingw_make_install # Drop all .la files -find $RPM_BUILD_ROOT -name "*.la" -delete +find %{buildroot} -name "*.la" -delete # No need to distribute manpages which appear in the Fedora # native packages already. -rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_mandir} # Win32 From 1da2f6d3707ea52bdff8c0d86a21967eed39934a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 13 Jan 2021 04:07:15 +0000 Subject: [PATCH 64/72] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mingw-libpng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 96fb519..84c9e59 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -13,6 +13,7 @@ Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{versio BuildArch: noarch +BuildRequires: make BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils From aac38123792778fdd0cb70e8a1629fb5d6076ce3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:06:29 +0000 Subject: [PATCH 65/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 84c9e59..81bca8a 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -134,6 +134,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.6.37-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.6.37-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9d5b9e584558cb673be4a6bb94b7344646df8178 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:37:31 +0000 Subject: [PATCH 66/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 81bca8a..f57d3f0 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -134,6 +134,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.6.37-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.6.37-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8e205a13637d4b9c6626c4ef0abb2846badeba72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 19:35:45 +0000 Subject: [PATCH 67/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index f57d3f0..7010235 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -134,6 +134,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.6.37-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.6.37-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b0e38f2dde1f496e206880f5b5aa2c094a03b08e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 14:26:17 +0100 Subject: [PATCH 68/72] Rebuild with mingw-gcc-12 --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 7010235..39a43bc 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -134,6 +134,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Fri Mar 25 2022 Sandro Mani - 1.6.37-8 +- Rebuild with mingw-gcc-12 + * Thu Jan 20 2022 Fedora Release Engineering - 1.6.37-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 98d7acb41612d0f9b454af976cdb9639d53479e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 21:27:41 +0000 Subject: [PATCH 69/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-libpng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 39a43bc..726d214 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -2,7 +2,7 @@ Name: mingw-libpng Version: 1.6.37 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MinGW Windows Libpng library License: zlib @@ -134,6 +134,9 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.6.37-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 25 2022 Sandro Mani - 1.6.37-8 - Rebuild with mingw-gcc-12 From 3f1cad67bd001a25173c48e1a211272968c633a7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 30 Aug 2022 17:05:19 +0200 Subject: [PATCH 70/72] Update source URL --- mingw-libpng.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 726d214..49a9fc2 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -7,9 +7,7 @@ Summary: MinGW Windows Libpng library License: zlib URL: http://www.libpng.org/pub/png/ -# Note: non-current tarballs get moved to the history/ subdirectory, -# so look there if you fail to retrieve the version you want -Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/libpng/libpng-%{version}.tar.xz BuildArch: noarch From 021fb3c6a651be524ce83f2b90242b62aeb6fcee Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 30 Aug 2022 17:14:39 +0200 Subject: [PATCH 71/72] ExclusiveArch: x86_64 --- mingw-libpng.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mingw-libpng.spec b/mingw-libpng.spec index 49a9fc2..11a9dd9 100644 --- a/mingw-libpng.spec +++ b/mingw-libpng.spec @@ -1,5 +1,8 @@ %{?mingw_package_header} +# MinGW is x86_64 only on epel9 for now +ExclusiveArch: x86_64 + Name: mingw-libpng Version: 1.6.37 Release: 9%{?dist} From 74be8d54ca1e268ffc7148e220d6290e52d28977 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:26:34 +0300 Subject: [PATCH 72/72] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 6b77392..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libpng-1.6.37.tar.xz) = 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074