From 7bf7433ecbe0cdd80a0fabf2fff86d3951c06253b59ea85e5c5c3e459c093782 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Mar 2008 01:56:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=10 --- gvfs-no-shebang.patch | 9 +++++ gvfs.changes | 7 ++++ gvfs.spec | 85 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 gvfs-no-shebang.patch diff --git a/gvfs-no-shebang.patch b/gvfs-no-shebang.patch new file mode 100644 index 0000000..77456e5 --- /dev/null +++ b/gvfs-no-shebang.patch @@ -0,0 +1,9 @@ +Index: gvfs-0.2.1/programs/gvfs-bash-completion.sh +=================================================================== +--- gvfs-0.2.1.orig/programs/gvfs-bash-completion.sh ++++ gvfs-0.2.1/programs/gvfs-bash-completion.sh +@@ -1,4 +1,3 @@ +-#!/bin/sh + + # Copyright (C) 2006-2007 Red Hat, Inc. + # diff --git a/gvfs.changes b/gvfs.changes index f902d23..b8382f8 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 19 18:26:29 CET 2008 - maw@suse.de + +- Reduce build requirements +- Split out a shared library package, libgnomevfscommon0, and two + module subpackages, gvfs-backends and gvfs-fuse. + ------------------------------------------------------------------- Tue Mar 18 19:05:18 CET 2008 - jpr@suse.de diff --git a/gvfs.spec b/gvfs.spec index 1080397..30a6e09 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -12,7 +12,7 @@ Name: gvfs -BuildRequires: bluez-utils dbus-1-glib-devel fuse-devel gconf2-devel glib2-devel gnome-keyring-devel hal-devel intltool libarchive-devel libavahi-glib-devel libsmbclient-devel libsoup-devel pkg-config +BuildRequires: bluez-utils fuse-devel gconf2-devel glib2-devel gnome-keyring-devel hal-devel intltool libarchive-devel libavahi-glib-devel libsmbclient-devel libsoup-devel pkg-config %if %suse_version > 1010 BuildRequires: libgphoto2-devel %else @@ -25,21 +25,71 @@ BuildRequires: extra-rpm-macros %endif Summary: VFS functionality for GLib Version: 0.2.1 -Release: 1 +Release: 3 License: LGPL v2.0 or later Group: Development/Libraries/C and C++ Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gvfs-no-shebang.patch bgo523420 maw@suse.de -- Is this even worth upstreaming? +Patch0: gvfs-no-shebang.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: %{name}-lang = %{version} -Recommends: fuse obex-data-server +Requires: libgvfscommon0 = %{version} +# +Recommends: gvfs-fuse +Recommends: gvfs-common %description VFS functionality for GLib. +Authors: +-------- + Alexander Larsson + +%package -n libgvfscommon0 +Summary: VFS functionality for GLib +Group: Development/Libraries/C and C++ +Requires: %{name} >= %{version} + +%description -n libgvfscommon0 +VFS functionality for GLib. + + + +Authors: +-------- + Alexander Larsson + +%package backends +Summary: VFS functionality for GLib +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +# FIXME: Requires: or Recommends:? +Requires: obex-data-server + +%description backends +VFS functionality for GLib. + + + +Authors: +-------- + Alexander Larsson + +%package fuse +Summary: VFS functionality for GLib +Group: System/Filesystems +Requires: %{name} = %{version} +Requires: fuse + +%description fuse +VFS functionality for GLib. + + + Authors: -------- Alexander Larsson @@ -61,6 +111,7 @@ Authors: %lang_package %prep %setup -n %{name}-%{version} +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -72,14 +123,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %makeinstall rm $RPM_BUILD_ROOT/%{_libdir}/*.*a rm $RPM_BUILD_ROOT/%{_libdir}/gio/modules/*.*a +# We can drop the chmod when bgo523420 is fixed. +chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/* %find_lang %{name} -%post -p /sbin/ldconfig +%post -n libgvfscommon0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libgvfscommon0 -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +###rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) @@ -87,11 +140,23 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/dbus-1/services/*.service %{_datadir}/gvfs -%{_libdir}/gvfs %{_libdir}/gio -%{_libdir}/*.so.* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/gvfsd %{_sysconfdir}/profile.d/* +%files fuse +%defattr(-, root, root) +%{_libdir}/%{name}/gvfs-fuse-daemon + +%files backends +%defattr(-, root, root) +%{_libdir}/%{name}/gvfsd-* + +%files -n libgvfscommon0 +%defattr(-, root, root) +%{_libdir}/*.so.* + %files devel %defattr(-, root, root) %{_includedir}/gvfs-client @@ -101,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}.lang %changelog +* Wed Mar 19 2008 maw@suse.de +- Reduce build requirements +- Split out a shared library package, libgnomevfscommon0, and two + module subpackages, gvfs-backends and gvfs-fuse. * Tue Mar 18 2008 jpr@suse.de - Update to version 0.2.1 * Added archive backend