[dvdauthor] Fix build with libpng 1.5 (patch from upstream). Clean up specfile constructs no longer needed with

[Ville Skyttä]

commit c13633269f874af20f46f88f9fb1ac80f5feb01f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Nov 5 22:03:00 2011 +0200

    Fix build with libpng 1.5 (patch from upstream).
    Clean up specfile constructs no longer needed with Fedora or EL6+.

 dvdauthor-0.7.0-libpng15.patch |   27 +++++++++++++++++++++++++++
 dvdauthor.spec                 |   19 +++++++++----------
 2 files changed, 36 insertions(+), 10 deletions(-)
---
diff --git a/dvdauthor-0.7.0-libpng15.patch b/dvdauthor-0.7.0-libpng15.patch
new file mode 100644
index 0000000..8e62cef
--- /dev/null
+++ b/dvdauthor-0.7.0-libpng15.patch
@@ -0,0 +1,27 @@
+commit c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
+Author: Lawrence D'Oliveiro <ldo at geek-central.gen.nz>
+Date:   Wed Jan 26 00:48:37 2011 +0000
+
+    fix to build against png-1.5 (thanks to Thomas Klausner)
+
+diff --git a/src/spuunmux.c b/src/spuunmux.c
+index 5e565d1..9ad2371 100644
+--- a/src/spuunmux.c
++++ b/src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@ static int write_png
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);
diff --git a/dvdauthor.spec b/dvdauthor.spec
index 52b6ed7..47503bd 100644
--- a/dvdauthor.spec
+++ b/dvdauthor.spec
@@ -1,15 +1,15 @@
 Name:           dvdauthor
 Version:        0.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line DVD authoring tool
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dvdauthor.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/dvdauthor/%{name}-%{version}.tar.gz
-# Sent upstream 2010-11-08
+# https://github.com/ldo/dvdauthor/commit/5c25b84
 Patch0:         %{name}-0.7.0-unset-home-650433.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# https://github.com/ldo/dvdauthor/commit/c82aaa4
+Patch1:         %{name}-0.7.0-libpng15.patch
 
 BuildRequires:  libdvdread-devel >= 0.9.4-4
 BuildRequires:  libpng-devel
@@ -30,6 +30,7 @@ GUI-based front ends if you prefer.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 chmod -c -x src/subgen-image.c
 
 
@@ -41,16 +42,10 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/dvdauthor
 %{_bindir}/dvddirdel
@@ -68,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov  5 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-5
+- Fix build with libpng 1.5 (patch from upstream).
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Fri Sep 23 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-4
 - Build with $RPM_LD_FLAGS.