rpms/ufraw/devel ufraw-0.11-exiv2.patch, NONE, 1.1 ufraw.spec, 1.17, 1.18

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730

Modified Files:
	ufraw.spec 
Added Files:
	ufraw-0.11-exiv2.patch 
Log Message:
* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
- initial exiv2 patch (#237846)


ufraw-0.11-exiv2.patch:

--- NEW FILE ufraw-0.11-exiv2.patch ---
--- ufraw-0.11/configure.ac.exiv2	2007-03-06 15:02:40.000000000 -0600
+++ ufraw-0.11/configure.ac	2007-04-25 13:09:06.000000000 -0500
@@ -185,12 +185,17 @@
 AC_MSG_RESULT($with_exiv2)
 have_exiv2=no
 if test $with_exiv2 = yes; then
+PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.14,
+ [ have_exiv2=yes
+   AC_DEFINE(HAVE_EXIV2, 1, have exiv2)],
+ [ 
   AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH)
   if test -n "$EXIV2_CONFIG"; then
     have_exiv2=yes
     AC_DEFINE(HAVE_EXIV2, 1, have exiv2)
     EXIV2_LIBS=`$EXIV2_CONFIG --libs`
   fi
+ ])
 fi
 
 UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS"
--- ufraw-0.11/ufraw_exiv2.cc.exiv2	2007-02-08 15:28:41.000000000 -0600
+++ ufraw-0.11/ufraw_exiv2.cc	2007-04-25 13:10:16.000000000 -0500
@@ -201,7 +201,7 @@
 }
 catch (Exiv2::AnyError& e) {
     std::cerr.rdbuf(savecerr);
-    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str());
+    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what());
     return UFRAW_ERROR;
 }
 


Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ufraw.spec	25 Apr 2007 17:07:01 -0000	1.17
+++ ufraw.spec	25 Apr 2007 18:16:44 -0000	1.18
@@ -14,7 +14,7 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://ufraw.sourceforge.net
@@ -24,7 +24,7 @@
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: lcms-devel
 BuildRequires: libexif-devel >= 0.6.13
-BuildRequires: exiv2-devel >= 0.10
+BuildRequires: exiv2-devel >= 0.14
 BuildRequires: libtiff-devel 
 BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig
@@ -44,6 +44,9 @@
 Requires(postun): shared-mime-info
 %endif
 
+BuildRequires: automake libtool
+Patch1: ufraw-0.11-exiv2.patch
+
 %description
 UFRaw is a tool for opening raw format images of digital cameras.
 
@@ -82,6 +85,9 @@
 EOF
 %setup -q
 
+%patch1 -p1 -b .exiv2
+./autogen.sh
+
 %build
 %configure --with-exiv2 --with-libexif --enable-mime --enable-extras
 make schemasdir=%{_sysconfdir}/gconf/schemas
@@ -140,6 +146,9 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
+- initial exiv2 patch (#237846)
+
 * Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-5
 - respin for exiv2-0.14