rpms/ufraw/devel ufraw-0.11-exiv2.patch, 1.1, 1.2 ufraw.spec, 1.18, 1.19
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Apr 26 13:37:40 UTC 2007
Author: rdieter
Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12827
Modified Files:
ufraw-0.11-exiv2.patch ufraw.spec
Log Message:
* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
- exiv2 patch (#237846)
ufraw-0.11-exiv2.patch:
Index: ufraw-0.11-exiv2.patch
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw-0.11-exiv2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufraw-0.11-exiv2.patch 25 Apr 2007 18:16:44 -0000 1.1
+++ ufraw-0.11-exiv2.patch 26 Apr 2007 13:37:05 -0000 1.2
@@ -1,10 +1,10 @@
--- 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
++++ ufraw-0.11/configure.ac 2007-04-26 08:13:12.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,
++PKG_CHECK_MODULES(EXIV2, exiv2,
+ [ have_exiv2=yes
+ AC_DEFINE(HAVE_EXIV2, 1, have exiv2)],
+ [
@@ -19,13 +19,14 @@
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 @@
++++ ufraw-0.11/ufraw_exiv2.cc 2007-04-26 08:15:51.000000000 -0500
+@@ -201,7 +201,8 @@
}
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());
++ std::string s(e.what());
++ ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
return UFRAW_ERROR;
}
Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ufraw.spec 25 Apr 2007 18:16:44 -0000 1.18
+++ ufraw.spec 26 Apr 2007 13:37:06 -0000 1.19
@@ -24,7 +24,7 @@
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: lcms-devel
BuildRequires: libexif-devel >= 0.6.13
-BuildRequires: exiv2-devel >= 0.14
+BuildRequires: exiv2-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
@@ -147,7 +147,7 @@
%changelog
* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
-- initial exiv2 patch (#237846)
+- exiv2 patch (#237846)
* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-5
- respin for exiv2-0.14
More information about the scm-commits
mailing list