From ebaf312e97e91e9bb48665cbe51ffa7c689cd71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 13 Feb 2008 23:30:35 +0000
Subject: [PATCH] - Apply sf.net patch #1790969 to fix crash with -log. -
 Cosmetic specfile changes.

---
 optipng-0.5.5-log.patch | 11 +++++++++++
 optipng.spec            | 15 +++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 optipng-0.5.5-log.patch

diff --git a/optipng-0.5.5-log.patch b/optipng-0.5.5-log.patch
new file mode 100644
index 0000000..589afbf
--- /dev/null
+++ b/optipng-0.5.5-log.patch
@@ -0,0 +1,11 @@
+--- src/optipng.c_orig	2007-09-09 10:02:38.000000000 +0200
++++ src/optipng.c	2007-09-09 10:03:56.000000000 +0200
+@@ -298,6 +298,8 @@
+       vfprintf(confile, fmt, arg_ptr);
+    if (global.logfile != NULL)
+    {
++      va_end(arg_ptr);
++      va_start(arg_ptr, fmt);
+       vfprintf(global.logfile, fmt, arg_ptr);
+       fflush(global.logfile);
+    }
diff --git a/optipng.spec b/optipng.spec
index 10a5989..de3bdae 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,12 +1,14 @@
 Name:           optipng
 Version:        0.5.5
-Release:        3%{?dist}
-Summary:        A PNG optimizer and converter
+Release:        4%{?dist}
+Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
-Source0:        http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
+# Patch0: http://sourceforge.net/tracker/index.php?func=detail&aid=1790969&group_id=151404&atid=780913
+Patch0:         optipng-0.5.5-log.patch
 Patch1:         optipng-0.5.4-makefile-externlibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,6 +23,7 @@ integrity checks and corrections.
 
 %prep
 %setup -q
+%patch0 -p0
 %patch1 -p1
 
 %define makefile gcc.mak
@@ -47,10 +50,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README.txt LICENSE.txt doc/*
 %{_bindir}/optipng
-%{_mandir}/man1/optipng.1.gz
+%{_mandir}/man1/optipng.1*
 
 
 %changelog
+* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.5-4
+- Apply sf.net patch #1790969 to fix crash with -log.
+- Cosmetic specfile changes.
+
 * Thu Aug 02 2007 Till Maas <opensource till name> - 0.5.5-3
 - update License: Tag according to new Guidelines