From e52e1442ef98ad2216520b2aa04e02048cd7bd558cc5a9c2d5913c2a4a578e71 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 27 Jul 2008 09:39:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libexif?expand=0&rev=13

---
 libexif-0.6.16.2.tar.bz2   |  4 ++--
 libexif-remove-safety.diff | 20 --------------------
 libexif.changes            |  5 +++++
 libexif.spec               | 14 ++++++--------
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 libexif-remove-safety.diff

diff --git a/libexif-0.6.16.2.tar.bz2 b/libexif-0.6.16.2.tar.bz2
index ccd2c63..d2d4bb9 100644
--- a/libexif-0.6.16.2.tar.bz2
+++ b/libexif-0.6.16.2.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00f327c23b614235de122244787a71cbe72d099545fe032d8ca338d47e30974e
-size 754740
+oid sha256:4ec6f6eee3b45c3ed7bf5787cffcb989ab16346d353d24f9fca088703482ba7f
+size 751042
diff --git a/libexif-remove-safety.diff b/libexif-remove-safety.diff
deleted file mode 100644
index c1795c5..0000000
--- a/libexif-remove-safety.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- libexif/exif-data.c	2008-03-17 08:22:12.755318000 +0100
-+++ libexif/exif-data.c	2008-04-28 10:45:27.000000000 +0200
-@@ -1219,8 +1219,16 @@
- 			exif_log (c->parent->priv->log, EXIF_LOG_CODE_DEBUG, "exif-data",
- 				  "No thumbnail but entries on thumbnail. These entries have been "
- 				  "removed.");
--			while (c->count)
-+			while (c->count) {
-+				int cnt = c->count;
- 				exif_content_remove_entry (c, c->entries[c->count - 1]);
-+				if (cnt == c->count) {
-+					/* safety net */
-+					exif_log (c->parent->priv->log, EXIF_LOG_CODE_DEBUG, "exif-data",
-+					"failed to remove last entry from entries.");
-+					c->count--;
-+				}
-+			}
- 		}
- 		break;
- 	default:
diff --git a/libexif.changes b/libexif.changes
index 35f3ef2..fef6135 100644
--- a/libexif.changes
+++ b/libexif.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 25 23:34:11 CEST 2008 - meissner@suse.de
+
+- fixed eog and gimp crashes bnc#404475, bnc#406299
+
 -------------------------------------------------------------------
 Mon Apr 28 10:52:57 CEST 2008 - meissner@suse.de
 
diff --git a/libexif.spec b/libexif.spec
index ef7af13..3548e7b 100644
--- a/libexif.spec
+++ b/libexif.spec
@@ -15,13 +15,12 @@ Name:           libexif
 BuildRequires:  doxygen
 Url:            http://libexif.sourceforge.net
 License:        LGPL v2.1 or later
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 Summary:        An EXIF Tag Parsing Library for Digital Cameras
 Version:        0.6.16.2
-Release:        25
+Release:        39
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         libexif-remove-safety.diff
 
 %description
 This library is used to parse EXIF information from JPEGs created by
@@ -53,7 +52,6 @@ Authors:
 
 %prep 
 %setup -q
-%patch0
 
 %build
 %configure \
@@ -71,11 +69,9 @@ make check
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}-12.lang
 %defattr(-,root,root)
@@ -90,6 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Sat Jul 26 2008 meissner@suse.de
+- fixed eog and gimp crashes bnc#404475, bnc#406299
 * Mon Apr 28 2008 meissner@suse.de
 - fixed endless loop problem in exif_content_remove_entry()
   bnc#380716