From a763e9a57e81cc6fff605641cb905f7dee33d1d1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon, 31 May 2010 11:06:36 +0000
Subject: [PATCH] - exiv2-0.20

---
 .cvsignore            |  2 +-
 exiv2-0.18-deps.patch | 23 -----------------------
 exiv2-0.20-deps.patch | 37 +++++++++++++++++++++++++++++++++++++
 exiv2.spec            | 26 +++++++++++++++-----------
 sources               |  2 +-
 5 files changed, 54 insertions(+), 36 deletions(-)
 delete mode 100644 exiv2-0.18-deps.patch
 create mode 100644 exiv2-0.20-deps.patch

diff --git a/.cvsignore b/.cvsignore
index ffc7698..8f8d0ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exiv2-0.19.tar.gz
+exiv2-0.20.tar.gz
diff --git a/exiv2-0.18-deps.patch b/exiv2-0.18-deps.patch
deleted file mode 100644
index 645779f..0000000
--- a/exiv2-0.18-deps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up exiv2-0.18-pre2/src/Makefile.deps exiv2-0.18-pre2/src/Makefile
---- exiv2-0.18-pre2/src/Makefile.deps	2008-09-18 05:26:58.000000000 -0500
-+++ exiv2-0.18-pre2/src/Makefile	2008-11-29 05:46:14.000000000 -0600
-@@ -192,11 +192,19 @@ $(CCOBJ): %.o: %.cpp
- 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -DEXV_BUILDING_LIB=1 -o $@ $<
- 	@$(MAKEDEPEND)
- 	@$(POSTDEPEND)
-+# The dependancies here are wrong.  It generates .lo output,
-+# so things are rebuilt *every* time 'make' is called.
-+# Let's try a quick-n-dirty hack -- Rex
-+	touch $@
- 
- $(COBJ): %.o: %.c
- 	@$(LIBTOOL) --mode=compile $(COMPILE.c) -DEXV_BUILDING_LIB=1 -o $@ $<
- 	@$(MAKEDEPEND)
- 	@$(POSTDEPEND)
-+# The dependancies here are wrong.  It generates .lo output,
-+# so things are rebuilt *every* time 'make' is called.
-+# Let's try a quick-n-dirty hack -- Rex
-+	touch $@
- 
- $(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
- 	$(COMPILE.cc) -o $@ $<
diff --git a/exiv2-0.20-deps.patch b/exiv2-0.20-deps.patch
new file mode 100644
index 0000000..7d6b205
--- /dev/null
+++ b/exiv2-0.20-deps.patch
@@ -0,0 +1,37 @@
+diff -up exiv2-0.20/src/Makefile.deps exiv2-0.20/src/Makefile
+--- exiv2-0.20/src/Makefile.deps	2010-05-25 10:25:02.000000000 -0500
++++ exiv2-0.20/src/Makefile	2010-05-30 13:33:38.181957187 -0500
+@@ -195,11 +195,19 @@ $(CCOBJ): %.o: %.cpp
+ 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -DEXV_BUILDING_LIB=1 -o $@ $<
+ 	@$(MAKEDEPEND)
+ 	@$(POSTDEPEND)
++# The dependancies here are wrong.  It generates .lo output,
++# so things are rebuilt *every* time 'make' is called.
++# Let's try a quick-n-dirty hack -- Rex
++	touch $@
+ 
+ $(COBJ): %.o: %.c
+ 	@$(LIBTOOL) --mode=compile $(COMPILE.c) -DEXV_BUILDING_LIB=1 -o $@ $<
+ 	@$(MAKEDEPEND)
+ 	@$(POSTDEPEND)
++# The dependancies here are wrong.  It generates .lo output,
++# so things are rebuilt *every* time 'make' is called.
++# Let's try a quick-n-dirty hack -- Rex
++	touch $@
+ 
+ $(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
+ 	$(COMPILE.cc) -o $@ $<
+diff -up exiv2-0.20/xmpsdk/src/Makefile.deps exiv2-0.20/xmpsdk/src/Makefile
+--- exiv2-0.20/xmpsdk/src/Makefile.deps	2010-04-03 02:53:30.000000000 -0500
++++ exiv2-0.20/xmpsdk/src/Makefile	2010-05-30 13:36:16.004947131 -0500
+@@ -108,6 +108,10 @@ $(CCOBJ): %.o: %.cpp
+ 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -o $@ $<
+ 	@$(MAKEDEPEND)
+ 	@$(POSTDEPEND)
++	# The dependancies here are wrong.  It generates .lo output,
++	# so things are rebuilt *every* time 'make' is called.
++	# Let's try a quick-n-dirty hack -- Rex
++	@touch $@
+ 
+ %.ii: %.cpp
+ 	set -e; \
diff --git a/exiv2.spec b/exiv2.spec
index 4d1b6e7..7f986b6 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -1,7 +1,7 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.19
+Version: 0.20
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -18,7 +18,7 @@ BuildRequires: zlib-devel
 # docs
 #BuildRequires: doxygen graphviz libxslt
 
-Patch1: exiv2-0.18-deps.patch
+Patch1: exiv2-0.20-deps.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -59,10 +59,6 @@ methods for Exif thumbnails, classes to access Ifd and so on.
 
 mkdir doc/html
 
-%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
-%endif
-
 
 %build
 %configure \
@@ -79,17 +75,22 @@ make install DESTDIR=%{buildroot}
 
 %find_lang exiv2
 
-# Unpackaged files
+## Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
 
-# fix perms on installed lib
+## fix perms on installed lib
 chmod 755 %{buildroot}%{_libdir}/lib*.so*
 
-# nuke rpaths
-chrpath --list   %{buildroot}%{_bindir}/exiv2
+## nuke rpaths
+chrpath --list   %{buildroot}%{_bindir}/exiv2 && \
 chrpath --delete %{buildroot}%{_bindir}/exiv2
 
 
+%check
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion exiv2)" = "%{version}"
+
+
 %clean
 rm -rf %{buildroot} 
 
@@ -107,7 +108,7 @@ rm -rf %{buildroot}
 
 %files libs -f exiv2.lang
 %defattr(-,root,root,-)
-%{_libdir}/libexiv2.so.6*
+%{_libdir}/libexiv2.so.9*
 
 %files devel
 %defattr(-,root,root,-)
@@ -118,6 +119,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 30 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.20-1
+- exiv2-0.20
+
 * Wed Dec 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.19-1
 - exiv2-0.19 (#552275)
 
diff --git a/sources b/sources
index bc0d50c..b4d73fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f52fb75a2cb7512f1484deab76473e13  exiv2-0.19.tar.gz
+3173d08a4313dc94b7bd1b7cdbda2093  exiv2-0.20.tar.gz