rpms/f-spot/devel f-spot-0.1.11-libdir.patch, NONE, 1.1 f-spot.spec, 1.25, 1.26

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Aug 18 15:22:45 UTC 2006


Author: alexl

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

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.1.11-libdir.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.1.11-5
- Rebuild with new mono and gtk-sharp2



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

--- NEW FILE f-spot-0.1.11-libdir.patch ---
--- f-spot-0.1.11/configure.in.libdir	2006-08-18 16:26:37.000000000 +0200
+++ f-spot-0.1.11/configure.in	2006-08-18 16:29:36.000000000 +0200
@@ -35,7 +35,7 @@
 needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services"
 for i in $needed_dlls; do
   AC_MSG_CHECKING([for $i.dll])
-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$i.dll; then
+  if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/1.0/$i.dll \); then
     AC_MSG_ERROR([missing required mono 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- f-spot.spec	27 Jul 2006 20:05:10 -0000	1.25
+++ f-spot.spec	18 Aug 2006 15:22:43 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.11
-Release:        4
+Release:        5
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -9,12 +9,15 @@
 Source0:        f-spot-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: f-spot-0.1.11-libdir.patch
+
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
-BuildRequires:  gtk-sharp2 >= 2.7 libgnome-devel libgnomeui-devel
+BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gettext
 BuildRequires:  dbus-sharp-devel
+BuildRequires:  autoconf
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 
@@ -34,8 +37,10 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .libdir
 
 %build
+autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make %{?_smp_mflags}
@@ -69,6 +74,9 @@
 %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.1.11-5
+- Rebuild with new mono and gtk-sharp2
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.1.11-4
 - Fix dbus-sharp BR
 




More information about the fedora-cvs-commits mailing list