rpms/control-center/devel control-center.spec, 1.489, 1.490 no-tweaks.patch, 1.5, 1.6
Matthias Clasen
mclasen at fedoraproject.org
Thu Sep 24 20:49:45 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32616
Modified Files:
control-center.spec no-tweaks.patch
Log Message:
Fix appearance capplet tabs
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- control-center.spec 23 Sep 2009 22:45:47 -0000 1.489
+++ control-center.spec 24 Sep 2009 20:49:45 -0000 1.490
@@ -24,7 +24,7 @@
Summary: Utilities to configure the GNOME desktop
Name: control-center
Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -89,7 +89,6 @@ Requires: libXrandr >= %{libXrandr_versi
# for /usr/share/pkgconfig
Requires: pkgconfig
-BuildRequires: autoconf automake libtool
BuildRequires: pango-devel
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -130,6 +129,7 @@ BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: scrollkeeper
BuildRequires: libcanberra-devel
BuildRequires: unique-devel
+BuildRequires: gnome-common
Requires(preun): GConf2
Requires(pre): GConf2
@@ -184,7 +184,6 @@ for the GNOME desktop.
%prep
%setup -q -n gnome-control-center-%{version}
-%patch3 -p1 -b .no-gnome-common
%patch10 -p0 -b .pam-fprintd
%patch22 -p0 -b .slab-icon-names
%patch30 -p1 -b .default-layout-toggle
@@ -194,14 +193,12 @@ for the GNOME desktop.
# vendor configuration patches
%patch95 -p1 -b .passwd
-#%patch96 -p1 -b .gecos
+##%patch96 -p1 -b .gecos
%patch99 -p1 -b .default-apps
%patch100 -p1 -b .common-tasks
%patch7 -p1 -b .make-default
-#autoreconf -f -i
-
%build
# Work-around http://bugzilla.gnome.org/show_bug.cgi?id=427939
@@ -380,6 +377,9 @@ fi
%changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Fix appearance capplet tabs
+
* Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
- Update to 2.28.0
no-tweaks.patch:
Makefile.am | 2
appearance-main.c | 1
data/appearance.ui | 365 -----------------------------------------------------
3 files changed, 1 insertion(+), 367 deletions(-)
Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- no-tweaks.patch 23 Sep 2009 22:16:29 -0000 1.5
+++ no-tweaks.patch 24 Sep 2009 20:49:45 -0000 1.6
@@ -1,6 +1,6 @@
diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.28.0/capplets/appearance/appearance-main.c
--- gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks 2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c 2009-09-23 16:46:07.350650695 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c 2009-09-24 16:43:11.954319878 -0400
@@ -165,7 +165,6 @@ main (int argc, char **argv)
desktop_init (data, (const gchar **) wallpaper_files);
g_strfreev (wallpaper_files);
@@ -10,9 +10,17 @@ diff -up gnome-control-center-2.28.0/cap
/* prepare the main window */
w = appearance_capplet_get_widget (data, "appearance_window");
diff -up gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks 2009-09-23 16:46:29.131395991 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui 2009-09-23 16:46:41.859650290 -0400
-@@ -1549,359 +1549,6 @@
+--- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks 2009-09-21 06:44:55.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui 2009-09-24 16:45:09.691322901 -0400
+@@ -745,6 +745,7 @@
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
++ <property name="use-underline">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+@@ -1549,370 +1550,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
@@ -369,12 +377,23 @@ diff -up gnome-control-center-2.28.0/cap
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label40">
- <property name="visible">True</property>
+- <child type="tab">
+- <object class="GtkLabel" id="label40">
+- <property name="visible">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="label" translatable="yes">Interface</property>
+- </object>
+- <packing>
+- <property name="position">3</property>
+- <property name="tab_fill">False</property>
+- </packing>
+- </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
diff -up gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.28.0/capplets/appearance/Makefile.am
--- gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks 2009-07-16 10:33:13.000000000 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am 2009-09-23 16:46:14.108648780 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am 2009-09-24 16:43:11.961075277 -0400
@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
appearance-themes.h \
appearance-style.c \
More information about the fedora-extras-commits
mailing list