rpms/gnumeric/devel gnumeric-1.8.4-backport-20090129.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090309.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090314.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090430.patch, NONE, 1.1 gnumeric.spec, 1.47, 1.48 gnumeric-1.8.4-recent.patch, 1.1, NONE
Robert Scheck
robert at fedoraproject.org
Tue Oct 20 22:30:08 UTC 2009
- Previous message: rpms/gnumeric/F-12 gnumeric-1.8.4-backport-20090129.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090309.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090314.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090430.patch, NONE, 1.1 gnumeric.spec, 1.48, 1.49 gnumeric-1.8.4-recent.patch, 1.1, NONE
- Next message: [pkgdb] bonnie++ ownership updated
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: robert
Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200/devel
Modified Files:
gnumeric.spec
Added Files:
gnumeric-1.8.4-backport-20090129.patch
gnumeric-1.8.4-backport-20090309.patch
gnumeric-1.8.4-backport-20090314.patch
gnumeric-1.8.4-backport-20090430.patch
Removed Files:
gnumeric-1.8.4-recent.patch
Log Message:
Applied 4 patches from the 1.8 stable branch (#500890, #505001)
gnumeric-1.8.4-backport-20090129.patch:
NEWS | 6 ++++++
plugins/python-loader/ChangeLog | 6 ++++++
plugins/python-loader/gnm-py-interpreter.c | 3 +--
3 files changed, 13 insertions(+), 2 deletions(-)
--- NEW FILE gnumeric-1.8.4-backport-20090129.patch ---
>From 8287b580c6e9d99cb095e4084d485f513180dca8 Mon Sep 17 00:00:00 2001
From: J.H.M. Dassen (Ray) <jdassen at src.gnome.org>
Date: Thu, 29 Jan 2009 14:33:02 +0000
Subject: Backport of fix for CVE-2009-0318 [#569648]
svn path=/branches/gnumeric-1-8/; revision=17111
---
diff --git a/NEWS b/NEWS
index cc2354f..a9ba585 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Gnumeric 1.8.5
+
+Jon Kåre:
+ * Work around vulnerability in Python. CVE-2009-0318 [#569648]
+
+--------------------------------------------------------------------------
Gnumeric 1.8.4
Henry Law:
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index 8609fee..5978766 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29 Jon K Hellan <hellan at acm.org>
+
+ * gnm-py-interpreter.c (gnm_py_interpreter_new): Work around
+ security vulnerability in Python by making argv start with
+ "/dev/null". #569648.
+
2009-01-18 Jody Goldberg <jody at gnome.org>
* Release 1.8.4
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 4664f2e..a33f38a 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -79,7 +79,7 @@ gnm_py_interpreter_class_init (GObjectClass *gobject_class)
G_TYPE_NONE, 0);
}
-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
+static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
GnmPyInterpreter *
gnm_py_interpreter_new (GOPlugin *plugin)
--
cgit v0.8.2
gnumeric-1.8.4-backport-20090309.patch:
NEWS | 4 ++++
src/dialogs/hf-config.glade | 2 +-
src/dialogs/hf-dt-format.glade | 2 +-
src/dialogs/preferences.glade | 3 +--
4 files changed, 7 insertions(+), 4 deletions(-)
--- NEW FILE gnumeric-1.8.4-backport-20090309.patch ---
>From 186423184f2ed8825f00fff8f12669ed99c8de2c Mon Sep 17 00:00:00 2001
From: Morten Welinder <mortenw at src.gnome.org>
Date: Mon, 09 Mar 2009 13:54:19 +0000
Subject: Backport.
Morten:
* Fix problem with dialogs not showing up in fullscreen mode.
[#574602]
svn path=/branches/gnumeric-1-8/; revision=17181
---
diff --git a/NEWS b/NEWS
index a9ba585..3603561 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.8.5
Jon Kåre:
* Work around vulnerability in Python. CVE-2009-0318 [#569648]
+Morten:
+ * Fix problem with dialogs not showing up in fullscreen mode.
+ [#574602]
+
--------------------------------------------------------------------------
Gnumeric 1.8.4
diff --git a/src/dialogs/hf-config.glade b/src/dialogs/hf-config.glade
index 1346ce4..e082ed8 100644
--- a/src/dialogs/hf-config.glade
+++ b/src/dialogs/hf-config.glade
@@ -5,7 +5,7 @@
<widget class="GtkDialog" id="hf-config">
<property name="width_request">600</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="spacing">8</property>
diff --git a/src/dialogs/hf-dt-format.glade b/src/dialogs/hf-dt-format.glade
index ee0e1e8..f2c3f39 100644
--- a/src/dialogs/hf-dt-format.glade
+++ b/src/dialogs/hf-dt-format.glade
@@ -5,7 +5,7 @@
<widget class="GtkDialog" id="hf-dt-format">
<property name="width_request">600</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="spacing">8</property>
diff --git a/src/dialogs/preferences.glade b/src/dialogs/preferences.glade
index 01cbfef..163d714 100644
--- a/src/dialogs/preferences.glade
+++ b/src/dialogs/preferences.glade
@@ -7,7 +7,7 @@
<property name="title" translatable="yes">Gnumeric Preferences</property>
<property name="default_width">350</property>
<property name="default_height">300</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
--
cgit v0.8.2
gnumeric-1.8.4-backport-20090314.patch:
ChangeLog | 11 +++++++++++
b/ChangeLog | 4 ++++
b/NEWS | 3 +++
b/src/application.c | 6 +++++-
b/src/application.h | 4 +++-
b/src/gnm-pane-impl.h | 7 +++----
b/src/gnm-pane.c | 40 ++++++++++++++++++++++++++++------------
b/src/gnm-plugin.c | 6 ++++--
b/src/wbc-gtk.c | 3 +--
9 files changed, 62 insertions(+), 22 deletions(-)
--- NEW FILE gnumeric-1.8.4-backport-20090314.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.
2009-03-13 Jody Goldberg <jody at gnome.org>
* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
(gnm_pane_unrealize) : set the flag.
* src/application.c (gnm_app_add_extra_ui) : take a group name.
(gnm_app_remove_extra_ui) : patch minor leak.
* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
group name rather than a static name that is shared between all
custom ui.
svn path=/branches/gnumeric-1-8/; revision=17077
---
diff --git a/ChangeLog b/ChangeLog
index 62ecf6f..6ac6e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-01-18 Jody Goldberg <jody at gnome.org>
+ * configure.in : post release bump
+
+2009-01-18 Jody Goldberg <jody at gnome.org>
+
* Release 1.8.4
2009-01-11 J.H.M. Dassen (Ray) <jdassen at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 6ac6e49..17b282a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-13 Jody Goldberg <jody at gnome.org>
+
+ * src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
+ (gnm_pane_unrealize) : set the flag.
+
+ * src/application.c (gnm_app_add_extra_ui) : take a group name.
+ (gnm_app_remove_extra_ui) : patch minor leak.
+ * src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
+ group name rather than a static name that is shared between all
+ custom ui.
+
2009-01-18 Jody Goldberg <jody at gnome.org>
* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 3603561..4391951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Gnumeric 1.8.5
+Jody:
+ * Work around semantic changes in gtk-2.16.
+
Jon Kåre:
* Work around vulnerability in Python. CVE-2009-0318 [#569648]
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
}
GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+ GSList *actions, char *layout,
char const *domain,
gpointer user_data)
{
GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
extra_uis = g_slist_prepend (extra_uis, extra_ui);
+ extra_ui->group_name = g_strdup (group_name);
extra_ui->actions = actions;
extra_ui->layout = layout;
extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
{
g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+ g_free (extra_ui->group_name);
+ g_free (extra_ui);
}
void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
GnmActionHandler handler;
};
typedef struct {
+ char const *group_name;
GSList *actions;
char *layout;
char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new (char const *name, char const *label,
GnmActionHandler handler);
void gnm_action_free (GnmAction *action);
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+ GSList *actions, char *layout,
char const *domain,
gpointer user_data);
void gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
gboolean sliding_adjacent_h, sliding_adjacent_v;
/* IM */
- guint reseting_im :1; /* quick hack to keep gtk_im_context_reset from starting an edit */
+ guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+ guint im_first_focus :1; /* see gnm_pane_init for details */
guint preedit_length;
GtkIMContext *im_context;
PangoAttrList *preedit_attrs;
- gboolean insert_decimal;
-
-
+ gboolean insert_decimal;
int index;
struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
event->keyval == GDK_KP_Decimal ||
event->keyval == GDK_KP_Separator;
- if (gtk_im_context_filter_keypress (pane->im_context,event))
+ if (gtk_im_context_filter_keypress (pane->im_context, event))
return TRUE;
- pane->reseting_im = TRUE;
+
+ /* in gtk-2.8 something changed. gtk_im_context_reset started
+ * triggering a pre-edit-changed. We'd end up start and finishing an
+ * empty edit every time the cursor moved */
+ pane->im_block_edit_start = TRUE;
gtk_im_context_reset (pane->im_context);
- pane->reseting_im = FALSE;
+ pane->im_block_edit_start = FALSE;
if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
return TRUE;
@@ -628,7 +632,17 @@ static gint
gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
{
#ifndef GNM_USE_HILDON
+ /* The first call to focus-in was sometimes the first thing to init the
+ * imcontext. In which case the im_context_focus_in would fire a
+ * preedit-changed, and we would start editing. */
+ GnmPane *pane = GNM_PANE (widget);
+ if (pane->im_first_focus)
+ pane->im_block_edit_start = TRUE;
gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+ if (pane->im_first_focus) {
+ pane->im_first_focus = FALSE;
+ pane->im_block_edit_start = FALSE;
+ }
#endif
return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
}
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
{
GtkStyle *style;
+ GNM_PANE (w)->im_block_edit_start = FALSE;
+
if (GTK_WIDGET_CLASS (parent_klass)->realize)
(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
pane = GNM_PANE (widget);
g_return_if_fail (pane != NULL);
- if (pane->im_context)
+ if (pane->im_context) {
+ pane->im_block_edit_start = TRUE;
gtk_im_context_set_client_window (pane->im_context, NULL);
+ }
(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
}
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
pango_attr_list_unref (pane->preedit_attrs);
gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
- /* in gtk-2.8 something changed. gtk_im_context_reset started
- * triggering a pre-edit-changed. We'd end up start and finishing an
- * empty edit every time the cursor moved */
- if (!pane->reseting_im &&
+ if (!pane->im_block_edit_start &&
!wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
gtk_im_context_reset (pane->im_context);
pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
pane->im_context = gtk_im_multicontext_new ();
pane->preedit_length = 0;
- pane->preedit_attrs = NULL;
- pane->reseting_im = FALSE;
+ pane->preedit_attrs = NULL;
+ pane->im_block_edit_start = FALSE;
+ pane->im_first_focus = TRUE;
GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
"width-pixels", 1,
NULL);
else {
- static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+ static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
GdkBitmap *stipple = gdk_bitmap_create_from_data (
- GTK_WIDGET (pane)->window, dat, 8, 8);
+ GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
g_object_unref (stipple);
}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
GError *err = NULL;
char *full_file_name;
- char *xml_ui;
+ char *xml_ui, *group_name;
char const *textdomain;
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
g_free (full_file_name);
textdomain = go_plugin_get_textdomain (service->plugin);
- service_ui->layout_id = gnm_app_add_extra_ui (
+ group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+ service_ui->layout_id = gnm_app_add_extra_ui (group_name,
service_ui->actions,
xml_ui, textdomain, service);
+ g_free (group_name);
service->is_active = TRUE;
}
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
GtkAction *res;
details = g_new0 (CustomUIHandle, 1);
- details->actions = gtk_action_group_new ("DummyName");
+ details->actions = gtk_action_group_new (extra_ui->group_name);
for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
action = ptr->data;
--
cgit v0.8.2
gnumeric-1.8.4-backport-20090430.patch:
NEWS | 1 +
src/dialogs/ChangeLog | 4 ++++
src/dialogs/anova-one.glade | 3 +--
src/dialogs/anova-two.glade | 3 +--
src/dialogs/cell-format.glade | 3 +--
src/dialogs/col-width.glade | 3 +--
src/dialogs/descriptive-stats.glade | 3 +--
src/dialogs/dialog-stf.glade | 6 ++----
src/dialogs/dialog-zoom.glade | 3 +--
src/dialogs/print.glade | 9 +++------
src/dialogs/row-height.glade | 3 +--
src/dialogs/simulation.glade | 12 ++++--------
src/dialogs/so-scrollbar.glade | 12 ++++--------
src/dialogs/solver.glade | 7 ++-----
14 files changed, 27 insertions(+), 45 deletions(-)
--- NEW FILE gnumeric-1.8.4-backport-20090430.patch ---
>From 75fe906cb0afce76a47338415773a6d4c5f07c5c Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra at gnome.org>
Date: Thu, 30 Apr 2009 23:04:49 +0000
Subject: Work around gtk+ 2.16 ABI break re spinbuttons.
---
diff --git a/NEWS b/NEWS
index 4391951..d1808a8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jon Kåre:
Morten:
* Fix problem with dialogs not showing up in fullscreen mode.
[#574602]
+ * Work around ABI changes in in gtk-2.16. [#580930]
--------------------------------------------------------------------------
Gnumeric 1.8.4
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 5f63b08..8fcc3f4 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-40 Morten Welinder <terra at gnome.org>
+
+ * *.glade: Work around ABI break for spinbuttons. #580930.
+
2009-01-18 Jody Goldberg <jody at gnome.org>
* Release 1.8.4
diff --git a/src/dialogs/anova-one.glade b/src/dialogs/anova-one.glade
index cf95a5b..a822db5 100644
--- a/src/dialogs/anova-one.glade
+++ b/src/dialogs/anova-one.glade
@@ -318,8 +318,7 @@
<property name="update_policy">GTK_UPDATE_IF_VALID</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0.05 0 1 0.01 10 10</property>
- </widget>
+ <property name="adjustment">0.05 0 1 0.01 10 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
diff --git a/src/dialogs/anova-two.glade b/src/dialogs/anova-two.glade
index 3b101fb..c25e425 100644
--- a/src/dialogs/anova-two.glade
+++ b/src/dialogs/anova-two.glade
@@ -263,8 +263,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0.05 0 1 0.01 0.05 0.05</property>
- </widget>
+ <property name="adjustment">0.05 0 1 0.01 0.05 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
diff --git a/src/dialogs/cell-format.glade b/src/dialogs/cell-format.glade
index be30f4f..968754d 100644
--- a/src/dialogs/cell-format.glade
+++ b/src/dialogs/cell-format.glade
@@ -356,8 +356,7 @@
<property name="update_policy">GTK_UPDATE_IF_VALID</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 20 1 10 10</property>
- </widget>
+ <property name="adjustment">0 0 20 1 10 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
diff --git a/src/dialogs/col-width.glade b/src/dialogs/col-width.glade
index 907a629..f87b21a 100644
--- a/src/dialogs/col-width.glade
+++ b/src/dialogs/col-width.glade
@@ -148,8 +148,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">5 5 1000 1 5 5</property>
- </widget>
+ <property name="adjustment">5 5 1000 1 5 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
diff --git a/src/dialogs/descriptive-stats.glade b/src/dialogs/descriptive-stats.glade
index 9653553..35bde2c 100644
--- a/src/dialogs/descriptive-stats.glade
+++ b/src/dialogs/descriptive-stats.glade
@@ -474,8 +474,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0.05 0 1 0.01 10 10</property>
- </widget>
+ <property name="adjustment">0.05 0 1 0.01 10 0</property> </widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
diff --git a/src/dialogs/dialog-stf.glade b/src/dialogs/dialog-stf.glade
index 0673cdd..77c7acd 100644
--- a/src/dialogs/dialog-stf.glade
+++ b/src/dialogs/dialog-stf.glade
@@ -515,8 +515,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
- </widget>
+ <property name="adjustment">1 1 100 1 10 0</property> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
@@ -557,8 +556,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
- </widget>
+ <property name="adjustment">1 1 100 1 10 0</property> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
diff --git a/src/dialogs/dialog-zoom.glade b/src/dialogs/dialog-zoom.glade
index 30e65cc..3cd716a 100644
--- a/src/dialogs/dialog-zoom.glade
+++ b/src/dialogs/dialog-zoom.glade
@@ -254,8 +254,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">100 10 500 5 25 25</property>
- </widget>
+ <property name="adjustment">100 10 500 5 25 0</property> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
diff --git a/src/dialogs/print.glade b/src/dialogs/print.glade
index 196ffd0..f2a1662 100644
--- a/src/dialogs/print.glade
+++ b/src/dialogs/print.glade
@@ -698,8 +698,7 @@
<widget class="GtkSpinButton" id="scale-h-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 1 100 1 10 10</property>
- <property name="climb_rate">1</property>
+ <property name="adjustment">1 1 100 1 10 0</property> <property name="climb_rate">1</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -747,8 +746,7 @@
<widget class="GtkSpinButton" id="scale-v-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 1 100 1 10 10</property>
- <property name="climb_rate">1</property>
+ <property name="adjustment">1 1 100 1 10 0</property> <property name="climb_rate">1</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -792,8 +790,7 @@
<widget class="GtkSpinButton" id="scale-percent-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">10 10 1000 1 10 10</property>
- <property name="climb_rate">1</property>
+ <property name="adjustment">10 10 1000 1 10 0</property> <property name="climb_rate">1</property>
<property name="digits">1</property>
<property name="numeric">True</property>
</widget>
diff --git a/src/dialogs/row-height.glade b/src/dialogs/row-height.glade
index 71e62b0..3004d87 100644
--- a/src/dialogs/row-height.glade
+++ b/src/dialogs/row-height.glade
@@ -149,8 +149,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">5 5 1000 1 5 5</property>
- </widget>
+ <property name="adjustment">5 5 1000 1 5 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
diff --git a/src/dialogs/simulation.glade b/src/dialogs/simulation.glade
index d084dfc..356c90b 100644
--- a/src/dialogs/simulation.glade
+++ b/src/dialogs/simulation.glade
@@ -345,8 +345,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">10 1 36000 10 10 10</property>
- </widget>
+ <property name="adjustment">10 1 36000 10 10 0</property> </widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -366,8 +365,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1000 1 1e+10 1000 10 10</property>
- </widget>
+ <property name="adjustment">1000 1 1e+10 1000 10 0</property> </widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -387,8 +385,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 1e+08 1 10 10</property>
- </widget>
+ <property name="adjustment">1 1 1e+08 1 10 0</property> </widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -408,8 +405,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 1e+08 1 10 10</property>
- </widget>
+ <property name="adjustment">1 1 1e+08 1 10 0</property> </widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
diff --git a/src/dialogs/so-scrollbar.glade b/src/dialogs/so-scrollbar.glade
index f4d7de2..8890bbb 100644
--- a/src/dialogs/so-scrollbar.glade
+++ b/src/dialogs/so-scrollbar.glade
@@ -194,8 +194,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 3001 1 10 1</property>
- <accessibility>
+ <property name="adjustment">0 0 3001 1 10 0</property> <accessibility>
<atkrelation target="label_min" type="labelled-by"/>
</accessibility>
</widget>
@@ -218,8 +217,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 3001 1 10 1</property>
- <accessibility>
+ <property name="adjustment">0 0 3001 1 10 0</property> <accessibility>
<atkrelation target="label_max" type="labelled-by"/>
</accessibility>
</widget>
@@ -242,8 +240,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 3001 1 10 1</property>
- <accessibility>
+ <property name="adjustment">0 0 3001 1 10 0</property> <accessibility>
<atkrelation target="label_increment" type="labelled-by"/>
</accessibility>
</widget>
@@ -266,8 +263,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 3001 1 10 1</property>
- <accessibility>
+ <property name="adjustment">0 0 3001 1 10 0</property> <accessibility>
<atkrelation target="label_page" type="labelled-by"/>
</accessibility>
</widget>
diff --git a/src/dialogs/solver.glade b/src/dialogs/solver.glade
index 66eab7c..b58fdf3 100644
--- a/src/dialogs/solver.glade
+++ b/src/dialogs/solver.glade
@@ -668,8 +668,7 @@ Bool
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">100 1 1e+10 10 10 10</property>
- </widget>
+ <property name="adjustment">100 1 1e+10 10 10 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -689,8 +688,7 @@ Bool
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">30 1 36000 10 10 10</property>
- </widget>
+ <property name="adjustment">30 1 36000 10 10 0</property> </widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
--
cgit v0.8.2
Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gnumeric.spec 12 Oct 2009 07:51:30 -0000 1.47
+++ gnumeric.spec 20 Oct 2009 22:30:08 -0000 1.48
@@ -1,7 +1,7 @@
Name: gnumeric
Epoch: 1
Version: 1.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Spreadsheet program for GNOME
Group: Applications/Productivity
# bug filed upstream about this being GPL v2 only:
@@ -12,7 +12,10 @@ Source: ftp://ftp.gnome.org/pu
Patch0: gnumeric-1.8.4-desktop.patch
Patch1: gnumeric-1.8.1-gnomedb-vercheck.patch
Patch2: gnumeric-1.8.2-python.patch
-Patch3: gnumeric-1.8.4-recent.patch
+Patch3: gnumeric-1.8.4-backport-20090129.patch
+Patch4: gnumeric-1.8.4-backport-20090309.patch
+Patch5: gnumeric-1.8.4-backport-20090314.patch
+Patch6: gnumeric-1.8.4-backport-20090430.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libgnomeui-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 2.8.2
@@ -64,7 +67,10 @@ This package contains the following addi
%patch0 -p1 -b .desktop
%patch1 -p1
%patch2 -p1 -b .new
-%patch3 -p1
+%patch3 -p1 -b backport-20090129
+%patch4 -p1 -b backport-20090309
+%patch5 -p1 -b backport-20090314
+%patch6 -p1 -b backport-20090430
chmod -x plugins/excel/rc4.?
@@ -193,6 +199,9 @@ fi
%changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-5
+- Applied 4 patches from the 1.8 stable branch (#500890, #505001)
+
* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
- Resolve rhbz #500890
--- gnumeric-1.8.4-recent.patch DELETED ---
- Previous message: rpms/gnumeric/F-12 gnumeric-1.8.4-backport-20090129.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090309.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090314.patch, NONE, 1.1 gnumeric-1.8.4-backport-20090430.patch, NONE, 1.1 gnumeric.spec, 1.48, 1.49 gnumeric-1.8.4-recent.patch, 1.1, NONE
- Next message: [pkgdb] bonnie++ ownership updated
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list