rpms/f-spot/devel f-spot-0.3.2-libdir.patch, NONE, 1.1 f-spot.spec, 1.34, 1.35

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4720

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.3.2-libdir.patch 
Log Message:
0.3.2


f-spot-0.3.2-libdir.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE f-spot-0.3.2-libdir.patch ---
--- f-spot-0.3.2/configure.in.libdir	2007-01-31 10:41:05.000000000 -0500
+++ f-spot-0.3.2/configure.in	2007-01-31 10:40:46.000000000 -0500
@@ -50,7 +50,7 @@
 needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services Mono.GetOptions"
 for i in $needed_dlls; do
   AC_MSG_CHECKING([for $i.dll])
-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
+  if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0//$i.dll \); then
     AC_MSG_ERROR([missing required mono 2.0 DLL: $i.dll])
   else
     AC_MSG_RESULT([found])


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- f-spot.spec	23 Jan 2007 06:52:07 -0000	1.34
+++ f-spot.spec	31 Jan 2007 15:34:16 -0000	1.35
@@ -9,8 +9,7 @@
 Source0:        f-spot-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: f-spot-0.1.11-libdir.patch
-Patch2: f-spot-0.2.0-libgphoto2-port.patch
+Patch1: f-spot-0.3.2-libdir.patch
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
@@ -41,7 +40,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libdir
-%patch2 -p1 -b .libphoto2-port
 
 %build
 autoconf