rpms/f-spot/devel f-spot-0.4.4-glib-sharp-2.12.0.patch, NONE, 1.1 f-spot.spec, 1.70, 1.71

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12214

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.4.4-glib-sharp-2.12.0.patch 
Log Message:
fix configure checks to find actual release of glib-sharp

f-spot-0.4.4-glib-sharp-2.12.0.patch:

--- NEW FILE f-spot-0.4.4-glib-sharp-2.12.0.patch ---
diff -up f-spot-0.4.4/gio-sharp/configure.BAD f-spot-0.4.4/gio-sharp/configure
--- f-spot-0.4.4/gio-sharp/configure.BAD	2008-06-04 13:11:52.000000000 -0400
+++ f-spot-0.4.4/gio-sharp/configure	2008-06-04 13:11:55.000000000 -0400
@@ -2764,7 +2764,7 @@ fi
 
 
 
-GLIB_SHARP_REQ_VERSION=2.12.1
+GLIB_SHARP_REQ_VERSION=2.12.0
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for GLIB_SHARP" >&5
diff -up f-spot-0.4.4/gio-sharp/configure.in.BAD f-spot-0.4.4/gio-sharp/configure.in
--- f-spot-0.4.4/gio-sharp/configure.in.BAD	2008-06-04 13:12:05.000000000 -0400
+++ f-spot-0.4.4/gio-sharp/configure.in	2008-06-04 13:12:09.000000000 -0400
@@ -85,7 +85,7 @@ AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)
 
-GLIB_SHARP_REQ_VERSION=2.12.1
+GLIB_SHARP_REQ_VERSION=2.12.0
 PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0 >= $GLIB_SHARP_REQ_VERSION)
 AC_SUBST(GLIB_SHARP_LIBS)
 AC_SUBST(GLIB_SHARP_CFLAGS)


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- f-spot.spec	4 Jun 2008 15:59:12 -0000	1.70
+++ f-spot.spec	4 Jun 2008 17:16:05 -0000	1.71
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -9,6 +9,9 @@
 Source0:        http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=510325
 Patch0:		x-content.patch
+# glib-sharp-2.12.1 doesnt't exist yet?
+# Can safely drop this patch when it does.
+Patch1:		f-spot-0.4.4-glib-sharp-2.12.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -49,6 +52,7 @@
 touch -r configure.in configure.in.stamp
 
 %patch0 -p1 -b .x-content
+%patch1 -p1 -b .glib-sharp-2.12.0
 
 # restore timestamps
 touch -r configure.in.stamp configure.in
@@ -107,6 +111,9 @@
 %{_datadir}/omf/f-spot
 
 %changelog
+* Wed Jun  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.4-2
+- Fix it to not look for non-existant glib-sharp-2.12.1
+
 * Wed Jun  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.4-1
 - update to 0.4.4
 - fix license tag