Readd missing service files

This commit is contained in:
Matthias Clasen 2010-02-26 01:02:15 +00:00
parent 53ecdf3469
commit 70ebb6f5a9
2 changed files with 22 additions and 1 deletions

View File

@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib Summary: Backends for the gio framework in GLib
Name: gvfs Name: gvfs
Version: 1.5.4 Version: 1.5.4
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -39,6 +39,8 @@ Patch0: gvfs-archive-integration.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=552856 # https://bugzilla.redhat.com/show_bug.cgi?id=552856
Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch
Patch16: servicedir.patch
BuildRequires: autoconf automake libtool gnome-common intltool
Obsoletes: gnome-mount <= 0.8 Obsoletes: gnome-mount <= 0.8
Obsoletes: gnome-mount-nautilus-properties <= 0.8 Obsoletes: gnome-mount-nautilus-properties <= 0.8
@ -135,7 +137,9 @@ including phones and music players to applications using gvfs.
%setup -q %setup -q
%patch0 -p1 -b .archive-integration %patch0 -p1 -b .archive-integration
%patch15 -p1 -b .gphoto2-storageinfo %patch15 -p1 -b .gphoto2-storageinfo
%patch16 -p1 -b .servicedir
autoreconf -i -f
%build %build
@ -222,6 +226,8 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/mounts/network.mount %{_datadir}/gvfs/mounts/network.mount
%{_datadir}/gvfs/mounts/ftp.mount %{_datadir}/gvfs/mounts/ftp.mount
%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service %{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
%{_datadir}/dbus-1/services/gvfs-daemon.service
%{_datadir}/dbus-1/services/gvfs-metadata.service
%{_datadir}/gvfs/remote-volume-monitors/gdu.monitor %{_datadir}/gvfs/remote-volume-monitors/gdu.monitor
%{_libdir}/libgvfscommon.so.* %{_libdir}/libgvfscommon.so.*
%{_libdir}/libgvfscommon-dnssd.so.* %{_libdir}/libgvfscommon-dnssd.so.*
@ -313,6 +319,9 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/remote-volume-monitors/afc.monitor %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
%changelog %changelog
* Thu Feb 25 2010 Matthias Clasen <mclasen@redhat.com> - 1.5.4-2
- Re-add missing service files
* Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> - 1.5.4-1 * Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> - 1.5.4-1
- Update to 1.5.4 - Update to 1.5.4

12
servicedir.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up gvfs-1.5.4/configure.ac.servicedir gvfs-1.5.4/configure.ac
--- gvfs-1.5.4/configure.ac.servicedir 2010-02-22 10:39:26.000000000 -0500
+++ gvfs-1.5.4/configure.ac 2010-02-25 19:46:43.964765020 -0500
@@ -49,7 +49,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1)
AC_ARG_WITH(dbus_service_dir,
AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files]),
- [default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
+ with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
DBUS_SERVICE_DIR=$with_dbus_service_dir
AC_SUBST(DBUS_SERVICE_DIR)