From ba09e2fdf1a66c97c91edd850e9bdd528ba333bd Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Fri, 7 Feb 2014 13:07:39 +1100
Subject: [PATCH] Update to 0.9.1. No API/ABI changes or soname bump.

---
 .gitignore              |  1 +
 libgexiv2-pkgconf.patch | 14 ++++++--------
 libgexiv2.spec          | 43 +++++++++++++++++++++++++++--------------
 sources                 |  2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7f258b..97367f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libgexiv2-0.1.90.tar.gz
 /libgexiv2-0.5.0.tar.xz
 /libgexiv2_0.6.1.tar.xz
 /libgexiv2-0.7.0.tar.xz
+/gexiv2-0.9.1.tar.xz
diff --git a/libgexiv2-pkgconf.patch b/libgexiv2-pkgconf.patch
index e948c05..1cf5bb9 100644
--- a/libgexiv2-pkgconf.patch
+++ b/libgexiv2-pkgconf.patch
@@ -1,13 +1,11 @@
-diff -up libgexiv2-0.4.1/gexiv2.m4.pkgconfig libgexiv2-0.4.1/gexiv2.m4
---- libgexiv2-0.4.1/gexiv2.m4.pkgconfig	2012-03-28 17:41:52.000000000 -0500
-+++ libgexiv2-0.4.1/gexiv2.m4	2012-05-03 08:07:39.951487246 -0500
-@@ -5,7 +5,7 @@ includedir=${prefix}/include
+--- gexiv2.pc.in.orig	2014-02-06 12:08:55.907388040 +1100
++++ gexiv2.pc.in	2014-02-06 12:09:13.555208865 +1100
+@@ -5,7 +5,7 @@
  
  Name: GExiv2
  Description: GObject bindings for exiv2
 -Requires: exiv2 glib-2.0 gobject-2.0
 +Requires.private: exiv2 glib-2.0 gobject-2.0
- Version: _VERSION_
- Libs: -L${libdir} -lgexiv2
- Cflags: -I${includedir}/gexiv2 -I${libdir}/gexiv2/include
-
+ Version: @GEXIV2_VERSION@
+ Libs: -L${libdir} -l@PACKAGE_NAME@
+ Cflags: -I${includedir}
diff --git a/libgexiv2.spec b/libgexiv2.spec
index 0540b02..290ceea 100644
--- a/libgexiv2.spec
+++ b/libgexiv2.spec
@@ -1,19 +1,24 @@
 Name:           libgexiv2
-Version:        0.7.0
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Gexiv2 is a GObject-based wrapper around the Exiv2 library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://trac.yorba.org/wiki/gexiv2 
-Source0:        http://yorba.org/download/gexiv2/0.6/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gexiv2/0.9/gexiv2-%{version}.tar.xz
 Patch0:         %{name}-pkgconf.patch
+#Patch1:         %{name}-%{version}-Makefile.patch
 
 BuildRequires:  exiv2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  libtool
 BuildRequires:  python-devel
 BuildRequires:  pygobject3-base
+
+# For tests
+BuildRequires:  vala vala-tools
+
 %if !0%{?rhel}
 BuildRequires:  python3-devel
 BuildRequires:  python3-gobject
@@ -53,24 +58,25 @@ This package contains the python3 bindings for %{name}
 %endif
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n gexiv2-%{version}
+%patch0 -p0
+#%patch1 -p0
 
 %build
-CFLAGS="%{optflags}"; export CFLAGS
-CXXFLAGS="%{optflags}"; export CXXFLAGS
-FFLAGS="%{optflags} -I/usr/lib64/gfortran/modules"; export FFLAGS
-LDFLAGS="-Wl,-z,relro"; export LDFLAGS
 
-# it is not an autotool generated configure script
-./configure --release --enable-introspection --prefix=/usr
+%configure --enable-tests --enable-introspection --enable-static=no --enable-shared=yes
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib}
+#make install DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib}
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
+# Can't get this to work at the moment
+#%check
+#make tests
+
 
 %post -p /sbin/ldconfig
 
@@ -78,13 +84,13 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
 
 %files
-%doc AUTHORS COPYING MAINTAINERS 
+%doc AUTHORS COPYING THANKS README
 %{_libdir}/libgexiv2.so.*
-%{_libdir}/girepository-1.0/GExiv2-0.4.typelib
+%{_libdir}/girepository-1.0/GExiv2-0.10.typelib
 
 %files devel
 %{_includedir}/gexiv2/
-%{_datadir}/gir-1.0/GExiv2-0.4.gir
+%{_datadir}/gir-1.0/GExiv2-0.10.gir
 %{_libdir}/libgexiv2.so
 %{_libdir}/pkgconfig/gexiv2.pc
 %{_datadir}/vala/vapi/gexiv2.vapi
@@ -100,6 +106,13 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 %endif
 
 %changelog
+* Thu Feb 06 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.9.1-1
+- Update to new release with fixes
+- Do not use tests yet, cant get them to run properly
+
+* Wed Feb 05 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.9.0-1
+- Update to latest unstable release
+
 * Tue Dec 03 2013 Rex Dieter <rdieter@fedoraproject.org> 0.7.0-2
 - rebuild (exiv2)
 
diff --git a/sources b/sources
index 84c59b6..da5ec87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15f5adab32022c6ab3f66d82eed7c1e8  libgexiv2-0.7.0.tar.xz
+c1854d78ff9d324391e8536ab0312867  gexiv2-0.9.1.tar.xz