rpms/control-center/devel .cvsignore, 1.77, 1.78 control-center-2.23.2-gecos.patch, 1.1, 1.2 control-center.spec, 1.379, 1.380 sources, 1.80, 1.81

Thu Jul 24 20:48:48 UTC 2008

Author: ssp

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18659

Modified Files:
	.cvsignore control-center-2.23.2-gecos.patch 
	control-center.spec sources 
Log Message:
Update to 2.23.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78

--- .cvsignore	18 Jun 2008 17:45:20 -0000	1.77
+++ .cvsignore	24 Jul 2008 20:48:03 -0000	1.78
@@ -1 +1,2 @@
 gnome-control-center-2.23.4.tar.bz2
+gnome-control-center-2.23.5.tar.bz2

control-center-2.23.2-gecos.patch:

Index: control-center-2.23.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center-2.23.2-gecos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.23.2-gecos.patch	28 May 2008 03:27:28 -0000	1.1
+++ control-center-2.23.2-gecos.patch	24 Jul 2008 20:48:03 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c.gecos	2008-05-27 23:22:26.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c	2008-05-27 23:23:17.000000000 -0400
+diff -up gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c
+--- gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c.gecos	2008-07-24 16:40:29.000000000 -0400
++++ gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c	2008-07-24 16:40:29.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <libebook/e-book.h>
  
@@ -289,9 +289,9 @@
  	widget = WID ("login");
  	gtk_label_set_text (GTK_LABEL (widget), me->login);
  
-diff -up gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade
---- gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade.gecos	2008-05-17 12:47:00.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade	2008-05-27 23:22:26.000000000 -0400
+diff -up gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade
+--- gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade.gecos	2008-07-08 14:21:03.000000000 -0400
++++ gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade	2008-07-24 16:40:29.000000000 -0400
 @@ -101,23 +101,30 @@
  		  </child>
  
@@ -340,9 +340,9 @@
  		    <packing>
  		      <property name="padding">0</property>
  		      <property name="expand">False</property>
-diff -up gnome-control-center-2.23.2/capplets/about-me/Makefile.am.gecos gnome-control-center-2.23.2/capplets/about-me/Makefile.am
---- gnome-control-center-2.23.2/capplets/about-me/Makefile.am.gecos	2008-05-17 12:47:00.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/about-me/Makefile.am	2008-05-27 23:22:26.000000000 -0400
+diff -up gnome-control-center-2.23.5/capplets/about-me/Makefile.am.gecos gnome-control-center-2.23.5/capplets/about-me/Makefile.am
+--- gnome-control-center-2.23.5/capplets/about-me/Makefile.am.gecos	2008-07-08 14:21:03.000000000 -0400
++++ gnome-control-center-2.23.5/capplets/about-me/Makefile.am	2008-07-24 16:40:29.000000000 -0400
 @@ -9,9 +9,6 @@ pixmap_files = 				\
  	gnome-about-me-lock-open.png
  
@@ -370,14 +370,15 @@
  	-DDATADIR="\"$(datadir)\"" \
  	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
  	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-diff -up gnome-control-center-2.23.2/configure.in.gecos gnome-control-center-2.23.2/configure.in
---- gnome-control-center-2.23.2/configure.in.gecos	2008-05-27 23:22:26.000000000 -0400
-+++ gnome-control-center-2.23.2/configure.in	2008-05-27 23:22:26.000000000 -0400
-@@ -255,6 +255,7 @@ if test x$enable_vfs_methods = xyes; the
-     FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"`
-     FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"`
-   fi
-+  PKG_CHECK_MODULES(EEL, eel-2.0)
- fi
- 
+diff -up gnome-control-center-2.23.5/configure.in.gecos gnome-control-center-2.23.5/configure.in
+--- gnome-control-center-2.23.5/configure.in.gecos	2008-07-24 16:40:29.000000000 -0400
++++ gnome-control-center-2.23.5/configure.in	2008-07-24 16:43:50.000000000 -0400
+@@ -188,6 +188,8 @@ dnl ====================================
+ dnl About-me
  dnl ==============================================
+ 
++PKG_CHECK_MODULES(EEL, eel-2.0)
++
+ AC_MSG_CHECKING([whether to enable About Me])
+ AC_ARG_ENABLE([aboutme],
+    AC_HELP_STRING([--enable-aboutme],


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- control-center.spec	24 Jul 2008 15:53:03 -0000	1.379
+++ control-center.spec	24 Jul 2008 20:48:03 -0000	1.380
@@ -3,7 +3,7 @@
 %define glib2_version 2.13.0
 %define gtk2_version 2.11.6
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.22.0-6
+%define gnome_desktop_version 2.23.5-1
 %define libgnome_version 2.3.0
 %define libbonobo_version 2.3.0
 %define libgnomeui_version 2.3.0
@@ -21,8 +21,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.23.4
-Release: 6%{?dist}
+Version: 2.23.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -39,10 +39,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=539339
 # http://bugzilla.gnome.org/show_bug.cgi?id=539340
 # http://bugzilla.gnome.org/show_bug.cgi?id=539343
-Patch9: standard-icon.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=542979
-Patch10: gcc-libcanberra-support-5.patch
+#Patch10: gcc-libcanberra-support-5.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
@@ -50,11 +49,6 @@
 # change default preferred apps to programs we ship
 Patch99: default-applications.patch
 
-Patch100: add-randr12-capplet.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=533611
-Patch101: notification-theme.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -171,19 +165,15 @@
 
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
-%patch9 -p1 -b .standard-icon
-%patch10 -p0 -b .libcanberra
+#%patch10 -p0 -b .libcanberra
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
 %patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
-%patch100 -p1 -b .add-randr12-capplet
 %patch7 -p1 -b .make-default
 
-%patch101 -p1 -b .notification-theme
-
 %build
 
 autoreconf
@@ -355,6 +345,11 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Jul 24 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.5-1
+- Update to 2.23.5. Drop randr, standard icon and
+  notification theme patches. 
+- Comment out libcanberra patch for now since it doesn't apply
+
 * Thu Jul 24 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.4-6
 - Add patch to support the Free Desktop sound theme spec
 - Remove gnome-vfs-methods as per upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	18 Jun 2008 17:45:20 -0000	1.80
+++ sources	24 Jul 2008 20:48:03 -0000	1.81
@@ -1 +1 @@
-100b1137a8da7c0bd9d165d97b2fe67f  gnome-control-center-2.23.4.tar.bz2
+8d4c9488bc0727b092f9ac96bafce6c6  gnome-control-center-2.23.5.tar.bz2


