From cff62049af639eb6588a211d3a543b22aae59eb8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Tue, 19 Sep 2006 19:06:40 +0000
Subject: [PATCH] - 0.11

---
 .cvsignore                 |  1 +
 exiv2-0.11-no_rpath.patch  | 11 +++++++++++
 exiv2-0.11-pkgconfig.patch | 12 ++++++++++++
 exiv2-0.9.1-no_rpath.patch | 20 --------------------
 exiv2.spec                 | 13 +++++++++----
 sources                    |  2 +-
 6 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 exiv2-0.11-no_rpath.patch
 create mode 100644 exiv2-0.11-pkgconfig.patch
 delete mode 100644 exiv2-0.9.1-no_rpath.patch

diff --git a/.cvsignore b/.cvsignore
index 9cb6be3..0564e66 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 exiv2-0.10.tar.gz
+exiv2-0.11.tar.gz
diff --git a/exiv2-0.11-no_rpath.patch b/exiv2-0.11-no_rpath.patch
new file mode 100644
index 0000000..27e02db
--- /dev/null
+++ b/exiv2-0.11-no_rpath.patch
@@ -0,0 +1,11 @@
+--- exiv2-0.11/src/Makefile.no_rpath	2006-09-19 13:49:19.000000000 -0500
++++ exiv2-0.11/src/Makefile	2006-09-19 13:50:05.000000000 -0500
+@@ -196,7 +196,7 @@
+ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c
+ COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c
+ # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
+-LINK.cc = $(CXX) $(CXXFLAGS) $(LIBRARY) $(LDFLAGS) -rpath $(libdir)
++LINK.cc = $(CXX) $(CXXFLAGS) $(LIBRARY) $(LDFLAGS) #-rpath $(libdir)
+ 
+ # ******************************************************************************
+ # Rules
diff --git a/exiv2-0.11-pkgconfig.patch b/exiv2-0.11-pkgconfig.patch
new file mode 100644
index 0000000..faee927
--- /dev/null
+++ b/exiv2-0.11-pkgconfig.patch
@@ -0,0 +1,12 @@
+--- exiv2-0.11/config/exiv2.pc.in.pkgconfig	2006-06-15 02:27:50.000000000 -0500
++++ exiv2-0.11/config/exiv2.pc.in	2006-09-19 13:54:00.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name: exiv2
+ Description: Exif and IPTC metadata library and tools
+ Version: @PACKAGE_VERSION@
+-URL: http://www.exiv2.org
+-Libs: -L${libdir} -lexiv2 @LIBS@
++#URL: http://www.exiv2.org
++Libs: -L${libdir} -lexiv2
++Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/exiv2-0.9.1-no_rpath.patch b/exiv2-0.9.1-no_rpath.patch
deleted file mode 100644
index ffae839..0000000
--- a/exiv2-0.9.1-no_rpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- exiv2-0.9.1/src/Makefile.no_rpath	2006-05-18 08:41:02.000000000 -0500
-+++ exiv2-0.9.1/src/Makefile	2006-05-18 09:10:11.000000000 -0500
-@@ -148,7 +148,7 @@
- # Compilation shortcuts
- COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c
- COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c
--LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) -rpath $(libdir)
-+LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) #-rpath $(libdir)
- 
- # ******************************************************************************
- # Rules
-@@ -203,7 +203,7 @@
- bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test
- 
- lib: $(OBJ)
--	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION)
-+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -release $(EXIV2_VERSION) -rpath $(libdir)
- 	@touch lib
- 
- path-test: path-test.o utils.o
diff --git a/exiv2.spec b/exiv2.spec
index 71cf8fb..c867e21 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -1,17 +1,18 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.10
-Release: 2%{?dist} 
+Version: 0.11
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
 URL: 	 http://www.exiv2.org/
-Source:	 http://www.exiv2.org/exiv2-%{version}.tar.gz
+Source0: http://www.exiv2.org/exiv2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: exiv2-0.9.1-no_rpath.patch
+Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
+Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -44,6 +45,7 @@ Requires: pkgconfig
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
+%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -92,6 +94,9 @@ rm -rf $FPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-1
+- 0.11
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.10-2
 - fc6 respin
 
diff --git a/sources b/sources
index 5b6119c..eae3eaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5af2256fb9895d9331684e8c1865b956  exiv2-0.10.tar.gz
+269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz