From 7260c4b5335262b8b7723cca29f0cdb2dd2cc945 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 13 May 2007 21:07:18 +0000
Subject: [PATCH] update to 0.6.14

svn path=/nixpkgs/trunk/; revision=8668
---
 .../development/libraries/libexif/default.nix |  6 ++--
 .../development/libraries/libexif/no-po.patch | 34 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 2a9857d77df3..1287594d5faf 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libexif-0.6.11";
+  name = "libexif-0.6.14";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libexif-0.6.11.tar.bz2;
-    md5 = "211996a336f1b1a06def5a6d5c94284e";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/libexif/libexif-0.6.14.tar.bz2;
+    sha256 = "0pza5ysvbvvliz7al2i8l3yai64w09xwc6ivy2v5cl7k43almz84";
   };
 
   patches = [./no-po.patch];
diff --git a/pkgs/development/libraries/libexif/no-po.patch b/pkgs/development/libraries/libexif/no-po.patch
index 7348b0085288..77e61236939a 100644
--- a/pkgs/development/libraries/libexif/no-po.patch
+++ b/pkgs/development/libraries/libexif/no-po.patch
@@ -1,20 +1,20 @@
-diff -rc libexif-0.6.11-orig/Makefile.in libexif-0.6.11/Makefile.in
-*** libexif-0.6.11-orig/Makefile.in	2004-10-16 14:21:37.000000000 +0200
---- libexif-0.6.11/Makefile.in	2005-03-11 11:35:24.000000000 +0100
+diff -rc libexif-0.6.14/Makefile.in libexif-0.6.14.new/Makefile.in
+*** libexif-0.6.14/Makefile.in	2007-05-10 17:14:58.000000000 +0200
+--- libexif-0.6.14.new/Makefile.in	2007-05-13 23:04:05.000000000 +0200
 ***************
-*** 215,221 ****
-  sharedstatedir = @sharedstatedir@
-  sysconfdir = @sysconfdir@
+*** 224,230 ****
   target_alias = @target_alias@
-! SUBDIRS = libexif libjpeg test po m4
-  EXTRA_DIST = @PACKAGE@.spec
-  
-  ########################################################################
---- 215,221 ----
-  sharedstatedir = @sharedstatedir@
-  sysconfdir = @sysconfdir@
+  top_builddir = @top_builddir@
+  top_srcdir = @top_srcdir@
+! SUBDIRS = m4m po libexif test doc binary
+  @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
+  EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
+  ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
+--- 224,230 ----
   target_alias = @target_alias@
-! SUBDIRS = libexif libjpeg test m4
-  EXTRA_DIST = @PACKAGE@.spec
-  
-  ########################################################################
+  top_builddir = @top_builddir@
+  top_srcdir = @top_srcdir@
+! SUBDIRS = m4m libexif test binary
+  @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
+  EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
+  ACLOCAL_AMFLAGS = -I auto-m4 -I m4m