rpms/control-center/devel .cvsignore, 1.93, 1.94 control-center.spec, 1.477, 1.478 no-tweaks.patch, 1.2, 1.3 sources, 1.96, 1.97

Matthias Clasen mclasen at fedoraproject.org
Tue Aug 25 03:40:33 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13802

Modified Files:
	.cvsignore control-center.spec no-tweaks.patch sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	18 Aug 2009 00:47:04 -0000	1.93
+++ .cvsignore	25 Aug 2009 03:40:33 -0000	1.94
@@ -1 +1 @@
-gnome-control-center-2.27.90.tar.bz2
+gnome-control-center-2.27.91.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- control-center.spec	23 Aug 2009 06:30:50 -0000	1.477
+++ control-center.spec	25 Aug 2009 03:40:33 -0000	1.478
@@ -23,8 +23,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.27.90
-Release: 5%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -59,15 +59,6 @@ Patch47: save-as.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591375
 Patch50: slideshow-ui.patch
 
-# from upstream
-Patch55: unique-ids.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=578109
-Patch56: rotate.patch
-
-#vhttp://bugzilla.gnome.org/show_bug.cgi?id=592642
-Patch57: font-viewer-icon.patch
-
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -191,9 +182,6 @@ utilities.
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .slideshow-ui
-%patch55 -p1 -b .unique-ids
-%patch56 -p1 -b .rotate
-%patch57 -p1 -b .font-viewer-icon
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -373,6 +361,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-5
 - Apply the patch...
 

no-tweaks.patch:
 Makefile.am                   |    3 
 appearance/Makefile.am        |    2 
 appearance/appearance-main.c  |    1 
 appearance/data/appearance.ui |  364 ------------------------------------------
 4 files changed, 1 insertion(+), 369 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- no-tweaks.patch	10 Aug 2009 16:14:29 -0000	1.2
+++ no-tweaks.patch	25 Aug 2009 03:40:33 -0000	1.3
@@ -1,35 +1,7 @@
-diff --git a/capplets/Makefile.am b/capplets/Makefile.am
-index d88c1d3..e30d861 100644
---- a/capplets/Makefile.am
-+++ b/capplets/Makefile.am
-@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
- 	keybindings		\
- 	keyboard		\
- 	mouse			\
--	network			\
--	windows
-+	network
- 
- SUBDIRS = $(always_built_SUBDIRS)
- 
-diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
-index 226e4ec..b940d73 100644
---- a/capplets/appearance/Makefile.am
-+++ b/capplets/appearance/Makefile.am
-@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
- 	appearance-themes.h \
- 	appearance-style.c \
- 	appearance-style.h \
--	appearance-ui.c \
--	appearance-ui.h \
- 	gedit-message-area.c \
- 	gedit-message-area.h \
- 	gnome-wp-info.c \
-diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
-index 369af02..86e4957 100644
---- a/capplets/appearance/appearance-main.c
-+++ b/capplets/appearance/appearance-main.c
-@@ -172,7 +172,6 @@ main (int argc, char **argv)
+diff -up gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.91/capplets/appearance/appearance-main.c
+--- gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks	2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/appearance-main.c	2009-08-24 23:31:28.843978482 -0400
+@@ -165,7 +165,6 @@ main (int argc, char **argv)
    desktop_init (data, (const gchar **) wallpaper_files);
    g_strfreev (wallpaper_files);
    font_init (data);
@@ -37,21 +9,22 @@ index 369af02..86e4957 100644
  
    /* prepare the main window */
    w = appearance_capplet_get_widget (data, "appearance_window");
-diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
-index a68894e..0270d4b 100644
---- a/capplets/appearance/data/appearance.ui
-+++ b/capplets/appearance/data/appearance.ui
-@@ -1506,365 +1506,6 @@
+diff -up gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui
+--- gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks	2009-08-24 23:34:19.741986359 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui	2009-08-24 23:36:37.898966013 -0400
+@@ -1530,370 +1530,6 @@
                  <property name="tab_fill">False</property>
                </packing>
              </child>
 -            <child>
 -              <object class="GtkVBox" id="interface_vbox">
+-                <property name="orientation">vertical</property>
 -                <property name="visible">True</property>
 -                <property name="border_width">12</property>
 -                <property name="spacing">18</property>
 -                <child>
 -                  <object class="GtkVBox" id="vbox23">
+-                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
 -                    <property name="spacing">6</property>
 -                    <child>
@@ -85,6 +58,7 @@ index a68894e..0270d4b 100644
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox24">
+-                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
 -                            <property name="spacing">6</property>
 -                            <child>
@@ -182,6 +156,7 @@ index a68894e..0270d4b 100644
 -                </child>
 -                <child>
 -                  <object class="GtkVBox" id="vbox25">
+-                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
 -                    <property name="spacing">6</property>
 -                    <child>
@@ -215,6 +190,7 @@ index a68894e..0270d4b 100644
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox26">
+-                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
 -                            <child>
 -                              <object class="GtkMenuBar" id="menubar">
@@ -407,3 +383,28 @@ index a68894e..0270d4b 100644
            </object>
            <packing>
              <property name="position">1</property>
+diff -up gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/appearance/Makefile.am
+--- gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks	2009-07-16 10:33:13.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/Makefile.am	2009-08-24 23:31:28.842973536 -0400
+@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
+ 	appearance-themes.h \
+ 	appearance-style.c \
+ 	appearance-style.h \
+-	appearance-ui.c \
+-	appearance-ui.h \
+ 	gedit-message-area.c \
+ 	gedit-message-area.h \
+ 	gnome-wp-info.c \
+diff -up gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/Makefile.am
+--- gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks	2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/Makefile.am	2009-08-24 23:31:28.841988564 -0400
+@@ -6,8 +6,7 @@ SUBDIRS = \
+ 	keybindings		\
+ 	keyboard		\
+ 	mouse			\
+-	network			\
+-	windows
++	network
+ 
+ DIST_SUBDIRS = \
+ 	common			\


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	18 Aug 2009 00:47:04 -0000	1.96
+++ sources	25 Aug 2009 03:40:33 -0000	1.97
@@ -1 +1 @@
-e60ba889c281e23079da2889144e5b48  gnome-control-center-2.27.90.tar.bz2
+fffc2c207a11f3f4d97828514200e61e  gnome-control-center-2.27.91.tar.bz2




More information about the fedora-extras-commits mailing list