From b2bae78c0b2a1b28bfc36144f7c0c8d22487caa6 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@redhat.com>
Date: Mon, 25 Jan 2016 16:46:18 +0100
Subject: [PATCH] Rebase to 1.4.7

- Fixes CVE-2014-9762, CVE-2014-9763, CVE-2014-9764
---
 .gitignore                  |  1 +
 imlib2-1.4.6-multilib.patch | 12 ------------
 imlib2-1.4.7-multilib.patch | 13 +++++++++++++
 imlib2.spec                 | 11 ++++++++---
 sources                     |  2 +-
 5 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 100644 imlib2-1.4.6-multilib.patch
 create mode 100644 imlib2-1.4.7-multilib.patch

diff --git a/.gitignore b/.gitignore
index d694620..e2ae6d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ imlib2-1.4.3.tar.bz2
 /imlib2-1.4.4.tar.bz2
 /imlib2-1.4.5.tar.bz2
 /imlib2-1.4.6.tar.bz2
+/imlib2-1.4.7.tar.bz2
diff --git a/imlib2-1.4.6-multilib.patch b/imlib2-1.4.6-multilib.patch
deleted file mode 100644
index 19b039d..0000000
--- a/imlib2-1.4.6-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
-+++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
-@@ -45,8 +45,7 @@
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
--      echo $libdirs -lImlib2 @my_libs@
-+      echo -lImlib2
-       ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/imlib2-1.4.7-multilib.patch b/imlib2-1.4.7-multilib.patch
new file mode 100644
index 0000000..1b71fda
--- /dev/null
+++ b/imlib2-1.4.7-multilib.patch
@@ -0,0 +1,13 @@
+diff -up imlib2-1.4.7/imlib2-config.in.multilib imlib2-1.4.7/imlib2-config.in
+--- imlib2-1.4.7/imlib2-config.in.multilib	2016-01-25 16:14:28.115088877 +0100
++++ imlib2-1.4.7/imlib2-config.in	2016-01-25 16:14:48.666279614 +0100
+@@ -45,8 +45,7 @@ while test $# -gt 0; do
+       echo $includes
+       ;;
+     --libs)
+-      libdirs=-L@libdir@
+-      echo $libdirs -lImlib2
++      echo -lImlib2
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/imlib2.spec b/imlib2.spec
index c21a214..faf0aaa 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -1,13 +1,14 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
-Version:        1.4.6
-Release:        4%{?dist}
+Version:        1.4.7
+Release:        1%{?dist}
 License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
 Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
 # Fedora specific multilib hack, upstream should switch to pkgconfig one day
-Patch0:         imlib2-1.4.6-multilib.patch
+Patch0:         imlib2-1.4.7-multilib.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
@@ -122,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 25 2016 Tomas Smetana <tsmetana@redhat.com> - 1.4.7-1
+- Rebase to 1.4.7
+- Fixes CVE-2014-9762, CVE-2014-9763, CVE-2014-9764
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 0ab2484..4968862 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c7104121ec6db652b37f74a6d7048e2  imlib2-1.4.6.tar.bz2
+f2f1418c376da6125453f90f2d58d938  imlib2-1.4.7.tar.bz2