From d28f19a865aaecbb798686bf544b49519491b6f4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Jul 2006 15:05:12 +0000 Subject: [PATCH] include monikers --- gnome-vfs2.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index d6235a9..896eee8 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -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 @@ Release: 1 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: %{name} = %{version}-%{release} 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 @@ shares (SMB) to applications using GNOME VFS. %patch104 -p1 -b .browser_default %patch201 -p0 -b .console +tar xjf %{SOURCE1} + %build if pkg-config openssl ; then @@ -124,6 +130,11 @@ autoconf 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 @@ export tagname=CC 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