Make --makefile-install-rule work even in packages that don't use the macros

epel9
Ray Strode 12 years ago
parent 9990a3d240
commit 3facff57e6

@ -6,7 +6,7 @@
Summary: A process-transparent configuration system Summary: A process-transparent configuration system
Name: GConf2 Name: GConf2
Version: 3.2.6 Version: 3.2.6
Release: 4%{?dist} Release: 5%{?dist}
License: LGPLv2+ and GPLv2+ License: LGPLv2+ and GPLv2+
Group: System Environment/Base Group: System Environment/Base
#VCS: git:git://git.gnome.org/gconf #VCS: git:git://git.gnome.org/gconf
@ -22,6 +22,7 @@ Patch1: drop-spew.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=755992 # https://bugzilla.redhat.com/show_bug.cgi?id=755992
Patch99: workaround-crash.patch Patch99: workaround-crash.patch
Patch100: pkill-hack.patch
BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: libxml2-devel >= %{libxml2_version}
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
@ -69,6 +70,7 @@ development using GConf.
%patch1 -p1 -b .drop-spew %patch1 -p1 -b .drop-spew
%patch99 -p1 -b .workaround-crash %patch99 -p1 -b .workaround-crash
%patch100 -p1 -b .pkill-hack
autoreconf -i -f autoreconf -i -f
@ -157,6 +159,9 @@ fi
%doc %{_mandir}/man1/gsettings-schema-convert.1* %doc %{_mandir}/man1/gsettings-schema-convert.1*
%changelog %changelog
* Wed Apr 17 2013 Ray Strode <rstrode@redhat.com> 3.2.6-5
- Make --makefile-install-rule work even in packages that don't use the macros
* Mon Apr 15 2013 Ray Strode <rstrode@redhat.com> 3.2.6-4 * Mon Apr 15 2013 Ray Strode <rstrode@redhat.com> 3.2.6-4
- Make pkill -HUP -f gconfd-2 work again - Make pkill -HUP -f gconfd-2 work again
- Make --makefile-install-rull less noisy - Make --makefile-install-rull less noisy

@ -82,6 +82,5 @@ for schema in %{*} ; do \
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \
fi \ fi \
pkill -HUP -f gconfd-2 || : \
done \ done \
%{nil} %{nil}

@ -0,0 +1,14 @@
diff -up GConf-3.2.6/gconf/gconftool.c.pkill-hack GConf-3.2.6/gconf/gconftool.c
--- GConf-3.2.6/gconf/gconftool.c.pkill-hack 2013-04-17 10:46:13.225426329 -0400
+++ GConf-3.2.6/gconf/gconftool.c 2013-04-17 10:48:25.963508300 -0400
@@ -916,8 +916,8 @@ main (int argc, char** argv)
use_local_source = TRUE;
- /* shut down daemon, this is a race condition, but will usually work. */
- gconf_shutdown_daemon (NULL);
+ g_spawn_command_line_sync ("/usr/bin/pkill -HUP -f /usr/libexec/gconfd-2",
+ NULL, NULL, NULL, NULL);
}
if (config_source == NULL)
Loading…
Cancel
Save