rpms/libgnomeui/devel standard.patch, NONE, 1.1 .cvsignore, 1.44, 1.45 libgnomeui.spec, 1.81, 1.82 sources, 1.44, 1.45

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	.cvsignore libgnomeui.spec sources 
Added Files:
	standard.patch 
Log Message:
Add gvfs filechooser backend


standard.patch:

--- NEW FILE standard.patch ---
diff --git a/src/gtkfilesystemgvfs.c b/src/gtkfilesystemgvfs.c
index 2a37194..15787c1 100644
--- a/src/gtkfilesystemgvfs.c
+++ b/src/gtkfilesystemgvfs.c
@@ -760,7 +760,7 @@ gtk_file_system_gvfs_get_folder (GtkFileSystem                  *file_system,
   handle->callback = callback;
   handle->data = data;
 
-  g_file_enumerate_children_async (file, "std,time,thumbnail::*", 0, 0,
+  g_file_enumerate_children_async (file, "standard,time,thumbnail::*", 0, 0,
 				   handle->cancellable,
 				   enumerate_children_callback,
 				   handle);
@@ -889,7 +889,7 @@ gtk_file_system_gvfs_get_info (GtkFileSystem                *file_system,
   handle->callback = callback;
   handle->data = data;
 
-  g_file_query_info_async (file, "std,time,thumbnail::*", 0, 0,
+  g_file_query_info_async (file, "standard,time,thumbnail::*", 0, 0,
 			   handle->cancellable,
 			   query_info_callback,
 			   handle);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	18 Oct 2007 03:13:43 -0000	1.44
+++ .cvsignore	22 Dec 2007 05:39:23 -0000	1.45
@@ -1 +1 @@
-libgnomeui-2.20.1.1.tar.bz2
+gtk-file-system-gvfs-0.0.1.tar.gz


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libgnomeui.spec	18 Oct 2007 03:13:43 -0000	1.81
+++ libgnomeui.spec	22 Dec 2007 05:39:24 -0000	1.82
@@ -4,7 +4,7 @@
 %define libbonoboui_version 2.13.1
 %define gconf2_version 2.3.0
 %define pango_version 1.2.0
-%define glib2_version 2.8.0
+%define glib2_version 2.15.0
 %define gtk2_version 2.11.5
 %define gnome_vfs2_version 2.7.3
 %define libglade2_version 2.0.0
@@ -18,15 +18,19 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.20.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.20/%{name}-%{version}.tar.bz2
+# from git://git.imendio.com/carlos/gtk-file-system-gvfs.git
+Source1: gtk-file-system-gvfs-0.0.1.tar.gz
+Patch0: standard.patch
 
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gvfs-devel
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version} 
@@ -101,18 +105,31 @@
 
 %prep
 %setup -q
+tar xzf %{SOURCE1}
+pushd gtk-file-system-gvfs-0.0.1 
+%patch -p1 -b .standard
+popd
 
 %build
 %configure --disable-gtk-doc --disable-static
 export tagname=CC
-make
+make %{?_smp_mflags}
+
+pushd gtk-file-system-gvfs-0.0.1 
+%configure --disable-static
+make %{?_smp_mflags}
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
+pushd gtk-file-system-gvfs-0.0.1 
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+find $RPM_BUILD_ROOT%{_libdir} -name *.la -exec rm \{\} \;
 
 %find_lang %{po_package}
 
@@ -131,8 +148,8 @@
 %{_libdir}/lib*.so.*
 ## FIXME questionable that libgnomeui still contains these
 %{_datadir}/pixmaps/*
-%{_libdir}/libglade/2.0/*
-%{_libdir}/gtk-2.0/*/filesystems/*
+%{_libdir}/libglade/2.0/*.so
+%{_libdir}/gtk-2.0/*/filesystems/*.so
 
 %files devel
 %defattr(-,root,root)
@@ -142,6 +159,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Sat Dec 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1.1-2
+- Add the gvfs filechooser backend
+
 * Wed Oct 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1.1-1
 - Update to 2.20.1.1 (fixes a crash in thumbnailing code) 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	18 Oct 2007 03:13:43 -0000	1.44
+++ sources	22 Dec 2007 05:39:24 -0000	1.45
@@ -1 +1,2 @@
+a372c9160334aa30ce3fd36084dfe6e4  gtk-file-system-gvfs-0.0.1.tar.gz
 d1f500c5d33ce93159b4952bb476fcf3  libgnomeui-2.20.1.1.tar.bz2