rpms/gnome-screensaver/devel button-images.patch, NONE, 1.1 gnome-screensaver.spec, 1.216, 1.217
Matthias Clasen
mclasen at fedoraproject.org
Thu Jul 16 19:36:18 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20140
Modified Files:
gnome-screensaver.spec
Added Files:
button-images.patch
Log Message:
Respect button-images setting
button-images.patch:
--- NEW FILE button-images.patch ---
diff -up gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui.button-images gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui
--- gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui.button-images 2009-07-16 15:30:41.194368588 -0400
+++ gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui 2009-07-16 15:29:57.822583091 -0400
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkImage" id="preview_image">
+ <property name="stock">gtk-fullscreen</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="power_image">
+ <property name="stock">gtk-jump-to</property>
+ <property name="icon_size">4</property>
+ </object>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">120</property>
<property name="lower">1</property>
@@ -55,66 +63,9 @@
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="stock">gtk-jump-to</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Power _Management</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">power_image</property>
+ <property name="label" translatable="yes">Power _Management</property>
+ <property name="use_underline">True</property>
</object>
</child>
<child>
@@ -244,66 +195,9 @@
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-fullscreen</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="preview_button_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Preview</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">preview_image</property>
+ <property name="label" translatable="yes">_Preview</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- gnome-screensaver.spec 15 Jul 2009 21:53:04 -0000 1.216
+++ gnome-screensaver.spec 16 Jul 2009 19:36:18 -0000 1.217
@@ -14,7 +14,7 @@
Summary: GNOME Screensaver
Name: gnome-screensaver
Version: 2.27.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Amusements/Graphics
Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -25,6 +25,10 @@ Patch2: gnome-screensaver-2.26.0-securit
Patch3: 0001-Disable-the-password-entry-when-using-non-password-a.patch
Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+# from upstream
+Patch9: use-gtkbuilder.patch
+# from upstream
+Patch10: button-images.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.gnome.org
@@ -32,7 +36,6 @@ BuildRequires: gtk2-devel => %{gtk2_vers
BuildRequires: libgnomeui-devel => %{libgnomeui_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: libglade2-devel => %{libglade2_version}
BuildRequires: libxml2-devel >= %{libxml2_version}
BuildRequires: GConf2-devel >= %{gconf2_version}
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
@@ -79,6 +82,8 @@ simple, sane, secure defaults and be wel
%patch3 -p1 -b .disable-entry
%patch7 -p1 -b .blank-by-default
%patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .use-gtkbuilder
+%patch10 -p1 -b .button-images
libtoolize --force --copy
@@ -149,6 +154,10 @@ fi
%doc %{_mandir}/man1/*.1.gz
%changelog
+* Thu Jul 16 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-4
+- Use GtkBulider
+- Respect button-images setting
+
* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-3
- Rebuild against new libgnomekbd
More information about the fedora-extras-commits
mailing list