2004-08-19 Kaushal Kumar <
[email protected]>
* control-center.spec: Updated.
* patches/control-center-16-solaris-tar-command.diff: Patch to fix
problem of directory option for Solaris tar.
--- a/ChangeLog Thu Aug 19 07:59:35 2004 +0000
+++ b/ChangeLog Thu Aug 19 09:34:01 2004 +0000
@@ -1,3 +1,9 @@
+2004-08-19 Kaushal Kumar <[email protected]>
+
+ * control-center.spec: Updated.
+ * patches/control-center-16-solaris-tar-command.diff: Patch to fix
+ problem of directory option for Solaris tar.
+
2004-08-19 Damien Carbery <[email protected]>
* gnome-user-docs.spec: Change user-guide perms to 0755 for integration.
--- a/control-center.spec Thu Aug 19 07:59:35 2004 +0000
+++ b/control-center.spec Thu Aug 19 09:34:01 2004 +0000
@@ -2,7 +2,7 @@
License: GPL
Group: System/GUI/GNOME
Version: 2.6.1
-Release: 24
+Release: 25
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: The GNOME control center for GNOME 2.6
@@ -40,6 +40,7 @@
Patch13: control-center-13-customize-system-bell.diff
Patch14: control-center-14-keyboard-layout.diff
Patch15: control-center-15-add-wallpaper-dialog.diff
+Patch16: control-center-16-solaris-tar-command.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -102,6 +103,9 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%ifos solaris
+%patch16 -p1
+%endif
%build
%ifos linux
@@ -203,6 +207,10 @@
%{_mandir}/man1/*
%changelog
+* Thu Aug 19 2004 - [email protected]
+- Added patch control-center-16-solaris-tar-command.diff to
+ fix problem of directory option for Solaris tar.
+
* Fri Aug 06 2004 - [email protected]
- Updated control-center-07-g11n-potfiles.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-16-solaris-tar-command.diff Thu Aug 19 09:34:01 2004 +0000
@@ -0,0 +1,26 @@
+--- control-center-2.6.1/capplets/theme-switcher/gnome-theme-installer.c 2004-02-12 20:48:30.000000000 +0600
++++ control-center-2.6.1-new/capplets/theme-switcher/gnome-theme-installer.c 2004-08-18 18:15:55.194445000 +0600
+@@ -45,8 +45,9 @@ transfer_done_targz_idle_cb (gpointer da
+ gchar *path = data;
+
+ /* this should be something more clever and nonblocking */
+- command = g_strdup_printf ("sh -c 'gzip -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
+- path, g_get_home_dir ());
++ command = g_strdup_printf ("sh -c 'cd \"%s/.themes\"; gzip -d -c < \"%s\" | tar xf -'",
++ g_get_home_dir (), path);
++
+ if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+ gnome_vfs_unlink (path);
+ g_free (command);
+@@ -74,8 +75,9 @@ transfer_done_tarbz2_idle_cb (gpointer d
+ gchar *path = data;
+
+ /* this should be something more clever and nonblocking */
+- command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
+- path, g_get_home_dir ());
++ command = g_strdup_printf ("sh -c 'cd \"%s/.themes\"; bzip2 -d -c < \"%s\" | tar xf -'",
++ g_get_home_dir (), path);
++
+ if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+ gnome_vfs_unlink (path);
+ g_free (command);