rpms/control-center/devel control-center.spec, 1.407, 1.408 display-no-help.patch, 1.1, 1.2 make-default.patch, 1.8, 1.9
Matthias Clasen
mclasen at fedoraproject.org
Thu Nov 13 19:36:41 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26316
Modified Files:
control-center.spec display-no-help.patch make-default.patch
Log Message:
2.25.1
Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- control-center.spec 13 Nov 2008 19:18:44 -0000 1.407
+++ control-center.spec 13 Nov 2008 19:36:07 -0000 1.408
@@ -35,9 +35,6 @@
# minor build breakage in gtk, will be fixed in the next gtk release
Patch8: gtkmarshal.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=456919
-Patch9: gcc-set-sound-theme-dir.patch
-
# https://bugzilla.redhat.com/show_bug.cgi?id=466342
Patch10: gcc-sound-props-remove-oss.patch
@@ -47,18 +44,9 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=554507
Patch25: ta-schema.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=554957
-Patch28: capplet-help.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=554962
-Patch29: hv-max.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=555591
Patch30: default-layout-toggle.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=556967
-Patch31: editable-sections.patch
-
Patch32: display-no-help.patch
# call the Fedora/RHEL graphical passwd changing apps
@@ -184,14 +172,10 @@
%patch3 -p1 -b .no-gnome-common
%patch8 -p1 -b .gtkmarshal
-%patch9 -p0 -b .default-dir
%patch10 -p0 -b .no-oss
%patch22 -p0 -b .slab-icon-names
%patch25 -p1 -b .ta-schema
-%patch28 -p1 -b .capplet-help
-%patch29 -p1 -b .hv-max
%patch30 -p1 -b .default-layout-toggle
-%patch31 -p1 -b .editable-sections
%patch32 -p1 -b .display-no-help
# vendor configuration patches
@@ -362,7 +346,7 @@
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
-* Thu Nonv 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.1-1
+* Thu Nov 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.1-1
- Update to 2.25.1
* Thu Nov 6 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-9
display-no-help.patch:
Index: display-no-help.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/display-no-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-no-help.patch 6 Nov 2008 23:55:45 -0000 1.1
+++ display-no-help.patch 13 Nov 2008 19:36:07 -0000 1.2
@@ -1,12 +1,12 @@
-diff -up gnome-control-center-2.24.0.1/capplets/display/display-capplet.glade.no-help gnome-control-center-2.24.0.1/capplets/display/display-capplet.glade
---- gnome-control-center-2.24.0.1/capplets/display/display-capplet.glade.no-help 2008-11-06 18:44:26.000000000 -0500
-+++ gnome-control-center-2.24.0.1/capplets/display/display-capplet.glade 2008-11-06 18:44:41.000000000 -0500
-@@ -219,7 +219,7 @@ Upside-down
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="helpbutton1">
-- <property name="visible">True</property>
-+ <property name="visible">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-help</property>
+diff -up gnome-control-center-2.25.1/capplets/display/display-capplet.glade.display-no-help gnome-control-center-2.25.1/capplets/display/display-capplet.glade
+--- gnome-control-center-2.25.1/capplets/display/display-capplet.glade.display-no-help 2008-11-05 09:21:32.000000000 -0500
++++ gnome-control-center-2.25.1/capplets/display/display-capplet.glade 2008-11-13 14:28:06.000000000 -0500
+@@ -33,7 +33,7 @@
+
+ <child>
+ <widget class="GtkButton" id="helpbutton1">
+- <property name="visible">True</property>
++ <property name="visible">False</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-help</property>
make-default.patch:
Index: make-default.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- make-default.patch 5 Aug 2008 17:05:36 -0000 1.8
+++ make-default.patch 13 Nov 2008 19:36:08 -0000 1.9
@@ -1,8 +1,8 @@
-diff -up gnome-control-center-2.23.6/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.23.6/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.23.6/capplets/appearance/appearance-desktop.c.make-default 2008-08-05 07:25:40.000000000 -0400
-+++ gnome-control-center-2.23.6/capplets/appearance/appearance-desktop.c 2008-08-05 13:02:03.000000000 -0400
-@@ -33,6 +33,9 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
+diff -up gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c.make-default 2008-11-05 09:21:32.000000000 -0500
++++ gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c 2008-11-13 14:31:40.000000000 -0500
+@@ -32,6 +32,9 @@
+ #include <libgnomeui/gnome-desktop-thumbnail.h>
#include <libgnomeui/gnome-bg.h>
+#include <dbus/dbus-glib.h>
@@ -11,7 +11,7 @@
enum {
TARGET_URI_LIST,
TARGET_BGIMAGE
-@@ -989,12 +992,61 @@ wp_select_after_realize (GtkWidget *widg
+@@ -988,12 +991,61 @@ wp_select_after_realize (GtkWidget *widg
select_item (data, item, TRUE);
}
@@ -73,7 +73,7 @@
g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-@@ -1115,6 +1167,24 @@ desktop_init (AppearanceData *data,
+@@ -1114,6 +1166,24 @@ desktop_init (AppearanceData *data,
/* create the file selector later to save time on startup */
data->wp_filesel = NULL;
@@ -98,9 +98,9 @@
}
void
-diff -up gnome-control-center-2.23.6/capplets/appearance/Makefile.am.make-default gnome-control-center-2.23.6/capplets/appearance/Makefile.am
---- gnome-control-center-2.23.6/capplets/appearance/Makefile.am.make-default 2008-08-05 07:25:40.000000000 -0400
-+++ gnome-control-center-2.23.6/capplets/appearance/Makefile.am 2008-08-05 13:02:03.000000000 -0400
+diff -up gnome-control-center-2.25.1/capplets/appearance/Makefile.am.make-default gnome-control-center-2.25.1/capplets/appearance/Makefile.am
+--- gnome-control-center-2.25.1/capplets/appearance/Makefile.am.make-default 2008-11-05 09:21:32.000000000 -0500
++++ gnome-control-center-2.25.1/capplets/appearance/Makefile.am 2008-11-13 14:28:38.000000000 -0500
@@ -42,7 +42,8 @@ gnome_appearance_properties_LDADD = \
$(top_builddir)/capplets/common/libcommon.la \
$(GNOMECC_CAPPLETS_LIBS) \
@@ -119,10 +119,10 @@
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-diff -up gnome-control-center-2.23.6/configure.in.make-default gnome-control-center-2.23.6/configure.in
---- gnome-control-center-2.23.6/configure.in.make-default 2008-08-05 13:02:03.000000000 -0400
-+++ gnome-control-center-2.23.6/configure.in 2008-08-05 13:04:17.000000000 -0400
-@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
+diff -up gnome-control-center-2.25.1/configure.in.make-default gnome-control-center-2.25.1/configure.in
+--- gnome-control-center-2.25.1/configure.in.make-default 2008-11-13 14:28:38.000000000 -0500
++++ gnome-control-center-2.25.1/configure.in 2008-11-13 14:28:38.000000000 -0500
+@@ -97,6 +97,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
PKG_CHECK_MODULES(GIO, gio-2.0)
More information about the fedora-extras-commits
mailing list