[freeimage/el6] Revert libpng 1.5 update.

[Richard Shaw]

commit 28f0df026bbd3503a1ae14cbd31efbd0cfeefbcb
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Fri Jul 6 10:33:31 2012 -0500

    Revert libpng 1.5 update.

 FreeImage-3.10.0-libpng15.patch |   35 -----------------------------------
 FreeImage-3.10.0-syslibs.patch  |   10 +++++-----
 freeimage.spec                  |   16 +---------------
 3 files changed, 6 insertions(+), 55 deletions(-)
---
diff --git a/FreeImage-3.10.0-syslibs.patch b/FreeImage-3.10.0-syslibs.patch
index bbeeef7..d10ebbd 100644
--- a/FreeImage-3.10.0-syslibs.patch
+++ b/FreeImage-3.10.0-syslibs.patch
@@ -28,8 +28,8 @@
  
 -COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
 -LIBRARIES = -lstdc++
-+COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden `pkgconfig --cflags libopenjpeg` -I/usr/include/OpenEXR
-+LIBRARIES = -lstdc++ -lz -lmng -lpng -ltiff -ljpeg `pkg-config --libs libopenjpeg` `pkg-config --libs OpenEXR`
++COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden -I/usr/include/OpenEXR
++LIBRARIES = -lstdc++ -lz -lmng -lpng -ltiff -ljpeg -lopenjpeg `pkg-config --libs OpenEXR`
  
  MODULES = $(SRCS:.c=.o)
  MODULES := $(MODULES:.cpp=.o)
@@ -40,7 +40,7 @@
  #include "FreeImage.h"
  #include "Utilities.h"
 -#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
++#include <openjpeg/openjpeg.h>
  
  /**
  Divide an integer by a power of 2 and round upwards
@@ -104,7 +104,7 @@
  #include "FreeImage.h"
  #include "Utilities.h"
 -#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
++#include <openjpeg/openjpeg.h>
  
  // ==========================================================
  // Plugin Interface
@@ -115,7 +115,7 @@
  #include "FreeImage.h"
  #include "Utilities.h"
 -#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
++#include <openjpeg/openjpeg.h>
  
  // ==========================================================
  // Plugin Interface
diff --git a/freeimage.spec b/freeimage.spec
index 9f0abd2..f929cf5 100644
--- a/freeimage.spec
+++ b/freeimage.spec
@@ -3,7 +3,7 @@
 
 Name:           freeimage
 Version:        3.10.0
-Release:        9%{?dist}
+Release:        5%{?dist}
 Summary:        Multi-format image decoder library
 Group:          System Environment/Libraries
 # freeimage is dual-licensed, see Whatsnew.txt (search for license) or:
@@ -13,7 +13,6 @@ URL:            http://freeimage.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/FreeImage%{_version}.zip
 Patch0:         FreeImage-3.10.0-syslibs.patch
 Patch1:         FreeImage-3.10.0-doxygen.patch
-Patch2:         FreeImage-3.10.0-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel OpenEXR-devel
 BuildRequires:  libmng-devel openjpeg-devel doxygen
@@ -38,7 +37,6 @@ developing applications that use %{name}.
 %setup -q -n FreeImage
 %patch0 -p1 -z .syslibs
 %patch1 -p1
-%patch2 -p0
 touch -r Source/FreeImage.h.syslibs Source/FreeImage.h
 
 # remove all included libs to make sure these don't get used during compile
@@ -116,18 +114,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Feb 13 2012 Bruno Wolff III <bruno at wolff.to> 3.10.0-9
-- Update for libpng 1.5 API
-
-* Thu Feb 09 2012 Rex Dieter <rdieter at fedoraproject.org> 3.10.0-8
-- rebuild (openjpeg)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.10.0-6
-- Rebuild for new libpng
-
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild