-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

diff --git a/GConf2-reload.patch b/GConf2-reload.patch
index 4c83a6b70a135bbabf2bad7a87234654800892fc..3293e0690b53422d4ecc1567ad41ca08557b1355 100644 (file)
--- 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 2de8488d1f05a2a1c0ab58ec45bf0932962fa410..9e3de497b770cfa8b08af718ea2f3171cf923884 100644 (file)
--- 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