From cce214b78ba96bc2f54e8f478d49f9bb995135ea Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 5 Feb 2013 19:16:21 +0100 Subject: [PATCH] Update to 1.15.3 --- .gitignore | 1 + gvfs-1.15.3-autoconf.patch | 109 ------------------------------------- gvfs.spec | 27 +++++++-- sources | 2 +- 4 files changed, 24 insertions(+), 115 deletions(-) delete mode 100644 gvfs-1.15.3-autoconf.patch diff --git a/.gitignore b/.gitignore index 5c474c9..c9f23ef 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ gvfs-1.6.3.tar.bz2 /gvfs-1.15.0.tar.xz /gvfs-1.15.1.tar.xz /gvfs-1.15.2.tar.xz +/gvfs-1.15.3.tar.xz diff --git a/gvfs-1.15.3-autoconf.patch b/gvfs-1.15.3-autoconf.patch deleted file mode 100644 index 251c193..0000000 --- a/gvfs-1.15.3-autoconf.patch +++ /dev/null @@ -1,109 +0,0 @@ -From fdbe5dd3fc723b303970e6b4e72de3a20c41d223 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Tue, 15 Jan 2013 16:11:44 +0000 -Subject: build: Replace deprecated autoconf macros - -Contains parts from https://live.gnome.org/GnomeGoals/ModernAutotools ---- -diff --git a/Makefile.am b/Makefile.am -index 76aac2a..dbe5a1e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -15,7 +15,7 @@ if BUILD_DOCUMENTATION - SUBDIRS += man - endif - --ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - -diff --git a/configure.ac b/configure.ac -index 88fffae..98f2ebc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,25 +2,32 @@ AC_PREREQ([2.64]) - - AC_INIT([gvfs],[1.15.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs]) - AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar]) --AM_CONFIG_HEADER(config.h) -+ -+AC_CONFIG_HEADERS(config.h) -+AC_CONFIG_MACRO_DIR([m4]) - - AM_SANITY_CHECK - - AC_C_CONST --AC_ISC_POSIX -+AC_SEARCH_LIBS([strerror],[cposix]) - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET --AM_DISABLE_STATIC --AM_PROG_LIBTOOL - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no) - AM_PROG_CC_C_O - AC_PROG_SED -+ -+# Initialize libtool -+LT_PREREQ([2.2]) -+LT_INIT([disable-static]) -+LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' -+AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -+ - AC_ARG_ENABLE(documentation, -- AC_HELP_STRING([--enable-documentation], -+ AS_HELP_STRING([--enable-documentation], - [build documentation]),, - enable_documentation=yes) - if test x$enable_documentation = xyes; then -@@ -50,9 +57,6 @@ saved_CFLAGS=$CFLAGS - AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) - CFLAGS=$saved_CFLAGS - --LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' --AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -- - GTK_DOC_CHECK - DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc" - AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) -@@ -718,7 +722,7 @@ AM_CONDITIONAL(USE_AFP, test "x$enable_afp" != "xno") - - dnl Install bash-completion file? - AC_ARG_ENABLE([bash-completion], -- AC_HELP_STRING([--disable-bash-completion], -+ AS_HELP_STRING([--disable-bash-completion], - [build without bash-completion support]), - msg_bash_completion=$enableval, - msg_bash_completion=yes) -@@ -728,7 +732,7 @@ fi - AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes") - - AC_ARG_WITH([bash-completion-dir], -- AC_HELP_STRING([--with-bash-completion-dir=PATH], -+ AS_HELP_STRING([--with-bash-completion-dir=PATH], - [choose directory for bash-completion file (default=DATADIR/bash-completion/completions)]), - with_bashcomp_dir=$withval, - with_bashcomp_dir=$datadir/bash-completion/completions) -@@ -850,7 +854,7 @@ else - AC_MSG_RESULT(no) - fi - --AC_OUTPUT([ -+AC_CONFIG_FILES([ - Makefile - common/Makefile - client/Makefile -@@ -870,6 +874,7 @@ man/Makefile - test/Makefile - po/Makefile.in - ]) -+AC_OUTPUT - - echo - echo "gvfs configuration summary:" --- -cgit v0.9.0.2 diff --git a/gvfs.spec b/gvfs.spec index 3e12764..d62feaa 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,6 +1,6 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 1.15.2 +Version: 1.15.3 Release: 1%{?dist} License: GPLv3 and LGPLv2+ Group: System Environment/Libraries @@ -39,9 +39,6 @@ BuildRequires: libtool # http://bugzilla.gnome.org/show_bug.cgi?id=567235 Patch0: gvfs-archive-integration.patch -# from git master -Patch1: gvfs-1.15.3-autoconf.patch - Obsoletes: gnome-mount <= 0.8 Obsoletes: gnome-mount-nautilus-properties <= 0.8 @@ -164,10 +161,20 @@ This package provides support for reading and writing files on MTP based devices (Media Transfer Protocol) to applications using gvfs. +%package goa +Summary: GOA support for gvfs +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: gnome-online-accounts-devel >= 3.7.1 + +%description goa +This package provides seamless integration with gnome-online-accounts +file services. + + %prep %setup -q %patch0 -p1 -b .archive-integration -%patch1 -p1 -b .autoconf %build # Needed for gvfs-0.2.1-archive-integration.patch @@ -223,6 +230,8 @@ killall -USR1 gvfsd >&/dev/null || : killall -USR1 gvfsd >&/dev/null || : %post mtp killall -USR1 gvfsd >&/dev/null || : +%post goa +killall -USR1 gvfsd >&/dev/null || : %ifnarch s390 s390x %post obexftp killall -USR1 gvfsd >&/dev/null || : @@ -355,7 +364,15 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service %{_datadir}/gvfs/remote-volume-monitors/mtp.monitor +%files goa +%{_libexecdir}/gvfs-goa-volume-monitor +%{_datadir}/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service +%{_datadir}/gvfs/remote-volume-monitors/goa.monitor + %changelog +* Tue Feb 5 2013 Tomas Bzatek - 1.15.3-1 +- Update to 1.15.3 + * Tue Jan 15 2013 Tomas Bzatek - 1.15.2-1 - Update to 1.15.2 diff --git a/sources b/sources index 92fae73..64e2cbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c86807222be5b03c2d9ff42d9e5f33e7 gvfs-1.15.2.tar.xz +748dcb2dae0cdcf6afb47c23bb9bc97c gvfs-1.15.3.tar.xz