From 702568370fa3368d54d7df4b48394044aea07384 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Thu, 20 Aug 2015 17:44:13 +0200 Subject: [PATCH] Rely on file triggers for schemas and desktop files https://lists.fedoraproject.org/pipermail/desktop/2015-August/012685.html --- gvfs.spec | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gvfs.spec b/gvfs.spec index fe1f561..b7c8d52 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,16 +1,16 @@ -%global glib2_version 2.45.0 +%global glib2_version 2.45.4-2 Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.25.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 URL: http://www.gtk.org Source: http://download.gnome.org/sources/gvfs/1.25/gvfs-%{version}.tar.xz BuildRequires: pkgconfig BuildRequires: glib2-devel >= %{glib2_version} -# for post-install update-gio-modules and overall functionality +# for file triggers and overall functionality Requires: glib2%{?_isa} >= %{glib2_version} BuildRequires: dbus-glib-devel BuildRequires: gcr-devel @@ -31,8 +31,9 @@ BuildRequires: gtk3-devel BuildRequires: docbook-style-xsl Requires: %{name}-client%{?_isa} = %{version}-%{release} -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +# for file triggers +Requires(post): desktop-file-utils >= 0.22-6 +Requires(postun): desktop-file-utils >= 0.22-6 # The patch touches Makefile.am files: BuildRequires: automake autoconf @@ -198,19 +199,9 @@ cp -p daemon/trashlib/COPYING COPYING.GPL3 /sbin/ldconfig # Reload .mount files: killall -USR1 gvfsd >&/dev/null || : -update-desktop-database &> /dev/null || : -gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : %postun /sbin/ldconfig -update-desktop-database &> /dev/null ||: -gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : -if [ $1 -eq 0 ] ; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - -%posttrans -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : # Reload .mount files when single subpackage is installed: @@ -228,11 +219,8 @@ killall -USR1 gvfsd >&/dev/null || : %endif %post archive -update-desktop-database >&/dev/null || : killall -USR1 gvfsd >&/dev/null || : -%postun archive -update-desktop-database >&/dev/null || : %files %dir %{_datadir}/gvfs @@ -357,6 +345,9 @@ update-desktop-database >&/dev/null || : %{_datadir}/installed-tests %changelog +* Thu Aug 20 2015 Ondrej Holy - 1.25.90-2 +- Rely on file triggers for schemas and desktop files + * Mon Aug 17 2015 Kalev Lember - 1.25.90-1 - Update to 1.25.90 - Use make_install macro