[nautilus-sendto/f18] Drop old GConf bits. Fedora versions that needed this haven't been supported for awhile. Update gset

Brian Pepple bpepple at fedoraproject.org
Wed Aug 22 19:27:13 UTC 2012


commit 5616ab9873556d695849c743f09c7cc0a48d20f5
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Aug 22 14:26:40 2012 -0500

    Drop old GConf bits. Fedora versions that needed this haven't been supported for awhile.
    Update gsetting scriptlets to follow wiki examples.

 nautilus-sendto.spec |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/nautilus-sendto.spec b/nautilus-sendto.spec
index 7d267cc..16686e2 100644
--- a/nautilus-sendto.spec
+++ b/nautilus-sendto.spec
@@ -1,7 +1,7 @@
 Name:           nautilus-sendto
 Epoch:          1
 Version:        3.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -17,10 +17,6 @@ BuildRequires:  perl-XML-Parser intltool
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  gupnp-devel >= 0.13
 
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
 # For compat with old nautilus-sendto packaging
 Provides: nautilus-sendto-gaim
 Obsoletes: nautilus-sendto-bluetooth
@@ -51,9 +47,7 @@ make %{?_smp_mflags}
 
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT \( -name '*.a' -o -name '*.la' \) -exec rm -f {} \;
 
@@ -64,16 +58,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
 %find_lang %{name}
 
 %posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %postun
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
-
-%pre
-%gconf_schema_prepare nst
-
-%preun
-%gconf_schema_remove nst
+if [ $1 -eq 0 ] ; then
+   /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
+fi
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog ChangeLog.pre-1.1.4.1 COPYING NEWS
@@ -93,6 +83,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_includedir}/nautilus-sendto/nautilus-sendto-plugin.h
 
 %changelog
+* Wed Aug 22 2012 Brian Pepple <bpepple at fedoraproject.org> - 1:3.5.3-4
+- Drop old GConf bits. Fedora versions that needed this haven't been supported for awhile.
+
 * Tue Aug 21 2012 Brian Pepple <bpepple at fedoraproject.org> - 1:3.5.3-3
 - Rebuild for new libcamel.
 


More information about the scm-commits mailing list