rpms/gnome-vfs2/devel .cvsignore, 1.34, 1.35 gnome-vfs2.spec, 1.114, 1.115 sources, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2898

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
include monikers



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	12 Jul 2006 14:12:03 -0000	1.34
+++ .cvsignore	12 Jul 2006 15:05:12 -0000	1.35
@@ -1 +1,2 @@
 gnome-vfs-2.15.3.tar.bz2
+gnome-vfs-monikers-2.15.3.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-vfs2.spec	12 Jul 2006 14:12:03 -0000	1.114
+++ gnome-vfs2.spec	12 Jul 2006 15:05:12 -0000	1.115
@@ -1,3 +1,4 @@
+%define libbonobo_version 2.2.0
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
@@ -16,14 +17,15 @@
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
+Source1: gnome-vfs-monikers-%{version}.tar.bz2
 URL: http://www.gnome.org/
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
+BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +74,8 @@
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
+Requires:   libbonobo-devel >= %{libbonobo_version}
+Conflicts: bonobo-devel < 1.0.8
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -103,6 +107,8 @@
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
+tar xjf %{SOURCE1}
+
 %build
 
 if pkg-config openssl ; then
@@ -124,6 +130,11 @@
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
+pushd gnome-vfs-monikers-%{version}
+./configure 
+make LIBTOOL=/usr/bin/libtool
+popd
+
 %install
 rm -fr $RPM_BUILD_ROOT
 
@@ -132,6 +143,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+pushd gnome-vfs-monikers-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+popd
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Jul 2006 14:12:03 -0000	1.34
+++ sources	12 Jul 2006 15:05:12 -0000	1.35
@@ -1 +1,2 @@
 f7eb8f2c658d6c8dfc34b5a2161e6890  gnome-vfs-2.15.3.tar.bz2
+b16f0db0482263be3318e269f52bb5b6  gnome-vfs-monikers-2.15.3.tar.bz2