7 files changed, 22 insertions, 62 deletions

diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 552d546ba528..dd26273d80ce 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -1,11 +1,7 @@
 bin/drivel
-etc/gconf/gconf.xml.defaults/apps/drivel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/drivel/global_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/drivel/moods/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/global_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/moods/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivel.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/drivel.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivel.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/drivel.desktop
 share/gnome/pixmaps/drivel/community.png
 share/gnome/pixmaps/drivel/doublearrow.png
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index c4d528224e5f..ce3deb105782 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -1,8 +1,8 @@
 bin/gdesklets
 bin/gdesklets-display-thumbnailer
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gdesklets-display-thumbnail.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
 libdata/pkgconfig/gdesklets-core.pc
 share/gnome/application-registry/gdesklets.applications
 share/gnome/applications/gdesklets.desktop
@@ -259,5 +259,3 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/Sensors
 @dirrm share/gnome/gdesklets/Displays
 @dirrm share/gnome/gdesklets
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 88436f96deb2..320b75052f86 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -1,8 +1,8 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
-etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomeblog.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
@@ -51,5 +51,3 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 072632982414..1c3576516b47 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,17 +1,15 @@
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
-etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gdict.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-search-tool.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/logview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
 share/gnome/applications/gnome-dictionary.desktop
@@ -241,14 +239,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
 @dirrm share/gnome/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 88436f96deb2..320b75052f86 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -1,8 +1,8 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
-etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomeblog.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
@@ -51,5 +51,3 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 072632982414..1c3576516b47 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,17 +1,15 @@
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
-etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gdict.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-search-tool.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/logview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
 share/gnome/applications/gnome-dictionary.desktop
@@ -241,14 +239,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
 @dirrm share/gnome/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/goats/pkg-plist b/deskutils/goats/pkg-plist
index 9fa31de3eac7..b9a3a55174f1 100644
--- a/deskutils/goats/pkg-plist
+++ b/deskutils/goats/pkg-plist
@@ -1,12 +1,8 @@
 bin/goats-applet
 bin/goat-create
-etc/gconf/gconf.xml.defaults/apps/goats/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/goats/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/goats/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/settings/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/goats.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GoatsApplet.server
 share/gnome/gnome-2.0/ui/GNOME_GoatsApplet.xml
 share/gnome/goats/alarm.png
@@ -38,9 +34,3 @@ share/locale/ru/LC_MESSAGES/goats-2.0.mo
 @dirrm share/gnome/help/goats/C
 @dirrm share/gnome/help/goats
 @dirrm share/gnome/goats
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats/defaults
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats/defaults
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats