rpms/GConf2/devel GConf-settings-migration.patch, NONE, 1.1 GConf2.spec, 1.130, 1.131

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16103

Modified Files:
	GConf2.spec 
Added Files:
	GConf-settings-migration.patch 
Log Message:
Add an autostart file for gsettings-data-convert


GConf-settings-migration.patch:
 Makefile.am                    |    5 ++++-
 gsettings-data-convert.desktop |    9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE GConf-settings-migration.patch ---
diff -up GConf-2.31.2/gsettings/gsettings-data-convert.desktop.settings-migration GConf-2.31.2/gsettings/gsettings-data-convert.desktop
--- GConf-2.31.2/gsettings/gsettings-data-convert.desktop.settings-migration	2010-05-21 19:19:16.420451458 -0400
+++ GConf-2.31.2/gsettings/gsettings-data-convert.desktop	2010-05-21 19:32:33.095449226 -0400
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=GSettings Data Conversion
+Comment=Migrates user settings from GConf to dconf
+Exec=gsettings-data-convert
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Initialization
diff -up GConf-2.31.2/gsettings/Makefile.am.settings-migration GConf-2.31.2/gsettings/Makefile.am
--- GConf-2.31.2/gsettings/Makefile.am.settings-migration	2010-04-20 19:47:00.000000000 -0400
+++ GConf-2.31.2/gsettings/Makefile.am	2010-05-21 19:19:16.422449991 -0400
@@ -35,6 +35,9 @@ gsettings_data_convert_LDADD =          
 	$(GSETTINGS_LIBS)                   \
 	$(NULL)
 
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = gsettings-data-convert.desktop
+
 man_MANS =                       \
 	gsettings-data-convert.1 \
 	$(NULL)
@@ -42,7 +45,7 @@ man_MANS =                       \
 gsettings-data-convert.1 : gsettings-data-convert.xml
 	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-EXTRA_DIST = gsettings-data-convert.xml gsettings-data-convert.1
+EXTRA_DIST = gsettings-data-convert.xml gsettings-data-convert.1 gsettings-data-convert.desktop
 
 dist-hook-local: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)';                      \


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- GConf2.spec	19 May 2010 22:54:17 -0000	1.130
+++ GConf2.spec	22 May 2010 00:05:08 -0000	1.131
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.31.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
@@ -42,6 +42,9 @@ Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
 
+Patch2: GConf-settings-migration.patch
+BuildRequires: autoconf automake libtool
+
 %description
 GConf is a process-transparent configuration database API used to
 store user preferences. It has pluggable backends and features to
@@ -77,6 +80,9 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .settings-migration
+
+autoreconf -i -f
 
 %build
 %configure --disable-static --enable-defaults-service
@@ -131,6 +137,7 @@ fi
 %{_bindir}/gconf-merge-tree
 %{_bindir}/gconftool-2
 %{_bindir}/gsettings-data-convert
+%{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop
 %{_libexecdir}/gconfd-2
 %{_libdir}/*.so.*
 %{_libdir}/GConf/2/*.so
@@ -165,6 +172,9 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Fri May 21 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.2-4
+- Install an autostart file for gsettings-data-convert
+
 * Wed May 19 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.2-3
 - Rebuild against newer glib