From 3187b1121f16d14f72654dfee32d114ab6d0cab3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Dec 18 2008 18:30:50 +0000
Subject: - exiv2-0.18


---

diff --git a/.cvsignore b/.cvsignore
index b81f8a0..e66dc43 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exiv2-0.17.1.tar.gz
+exiv2-0.18.tar.gz
diff --git a/exiv2-0.18-deps.patch b/exiv2-0.18-deps.patch
new file mode 100644
index 0000000..645779f
--- /dev/null
+++ b/exiv2-0.18-deps.patch
@@ -0,0 +1,23 @@
+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.9.1-deps.patch b/exiv2-0.9.1-deps.patch
deleted file mode 100644
index 3460dba..0000000
--- a/exiv2-0.9.1-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- exiv2-0.9.1/src/Makefile.deps	2006-01-20 02:45:59.000000000 -0600
-+++ exiv2-0.9.1/src/Makefile	2006-05-18 09:10:11.000000000 -0500
-@@ -156,6 +156,10 @@
- 	@$(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 $@
- 
- $(COBJ): %.o: %.c
- 	@$(LIBTOOL) --mode=compile $(COMPILE.c) -o $@ $<
diff --git a/exiv2.spec b/exiv2.spec
index 8199408..4f0a373 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -6,8 +6,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.17.1
-Release: 2%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -23,7 +23,7 @@ BuildRequires: zlib-devel
 # docs
 #BuildRequires: doxygen graphviz libxslt
 
-Patch1: exiv2-0.9.1-deps.patch
+Patch1: exiv2-0.18-deps.patch
 Patch2: exiv2-0.16-gcc43.patch
 
 %if 0%{?libs}
@@ -69,7 +69,7 @@ methods for Exif thumbnails, classes to access Ifd and so on.
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch1 -p1 -b .deps
-%patch2 -p1 -b .gcc43
+#patch2 -p1 -b .gcc43
 
 mkdir doc/html
 
@@ -119,7 +119,7 @@ rm -rf %{buildroot}
 %files libs -f exiv2.lang
 %defattr(-,root,root,-)
 %endif
-%{_libdir}/libexiv2.so.4*
+%{_libdir}/libexiv2.so.5*
 
 %files devel
 %defattr(-,root,root,-)
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter@fedoraproject.org> 0.18-1
+- exiv2-0.18
+
 * Fri Dec 12 2008 Rex Dieter <rdieter@fedoraproject.org> 0.17.2-2
 - rebuild for pkgconfig deps
 
diff --git a/sources b/sources
index fb56a45..69dff30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52a602f4f0d9e89b7084ac795b7547ac  exiv2-0.17.1.tar.gz
+03044792525ae0a1b109df5a53b858fb  exiv2-0.18.tar.gz