From a727db141b7a42da9fad721bd9c1326a3cda14f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 5 Mar 2013 23:43:04 +0200 Subject: [PATCH] -reload.patch uses killall, add psmisc dependency update killall path, in pld killall has almost always been in /bin/killall [1], so this patch never-ever worked. http://git.pld-linux.org/?p=packages/psmisc.git;a=commit;h=f68c2d17b7c6046f042f602e693547dea3262ecc --- GConf2-reload.patch | 4 ++-- GConf2.spec | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/GConf2-reload.patch b/GConf2-reload.patch index 4c83a6b..3293e06 100644 --- a/GConf2-reload.patch +++ b/GConf2-reload.patch @@ -15,7 +15,7 @@ diff -d -u -p -U10 -r1.102 gconftool.c gconf_engine_unref (conf); -+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ g_spawn_command_line_sync ("/usr/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); + return retval; } @@ -29,7 +29,7 @@ diff -d -u -p -U10 -r1.102 gconftool.c gconf_engine_unref (conf); + -+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ g_spawn_command_line_sync ("/usr/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); return retval; } diff --git a/GConf2.spec b/GConf2.spec index 2de8488..9e3de49 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -4,7 +4,7 @@ # # Conditional build: %bcond_without static_libs # don't build static libraries -# + Summary: GNOME2 configuration database system Summary(pl.UTF-8): System konfiguracyjnej bazy danych dla GNOME 2 Summary(pt_BR.UTF-8): Sistema de Configuração do GNOME 2 @@ -44,6 +44,7 @@ BuildRequires: xz Requires(post): findutils Requires(post,postun): glib2 >= 1:2.31.0 Requires: %{name}-libs = %{version}-%{release} +Requires: psmisc >= 20.1-2 Obsoletes: GConf2-xinitrc Obsoletes: libGConf2 # sr@Latn vs. sr@latin @@ -241,7 +242,7 @@ exit 0 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so %attr(755,root,root) %{_libdir}/gio/modules/libgsettingsgconfbackend.so -%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf +/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf %{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop %dir %{_sysconfdir}/gconf %dir %{_sysconfdir}/gconf/2 -- 2.43.0