rpms/control-center/devel .cvsignore, 1.85, 1.86 control-center.spec, 1.429, 1.430 sources, 1.88, 1.89 gcc-set-https-handler.patch, 1.1, NONE gtkmarshal.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	.cvsignore control-center.spec sources 
Removed Files:
	gcc-set-https-handler.patch gtkmarshal.patch 
Log Message:
2.25.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	18 Dec 2008 19:43:47 -0000	1.85
+++ .cvsignore	5 Feb 2009 05:12:54 -0000	1.86
@@ -1 +1 @@
-gnome-control-center-2.25.3.tar.bz2
+gnome-control-center-2.25.90.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- control-center.spec	23 Jan 2009 11:21:08 -0000	1.429
+++ control-center.spec	5 Feb 2009 05:12:54 -0000	1.430
@@ -21,8 +21,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.25.3
-Release: 5%{?dist}
+Version: 2.25.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -32,11 +32,6 @@
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
 Patch7: make-default.patch
-# minor build breakage in gtk, will be fixed in the next gtk release
-Patch8: gtkmarshal.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=568408
-Patch9: gcc-set-https-handler.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=475804
 Patch10: gcc-pam-fprintd-avail.patch
@@ -64,7 +59,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
-Obsoletes: gnome fontilus
 # the background capplets expects its .xml files in 
 # a different place now
 Conflicts: desktop-backgrounds-basic < 2.0-27
@@ -107,9 +101,7 @@
 BuildRequires: gnome-panel-devel
 BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
 BuildRequires: gnome-settings-daemon-devel
-# For intltool:
 BuildRequires: intltool >= 0.37.1
-BuildRequires: perl(XML::Parser) 
 BuildRequires: evolution-data-server-devel >= 1.9.1
 BuildRequires: libXxf86misc-devel 
 BuildRequires: libxkbfile-devel
@@ -170,8 +162,6 @@
 %setup -q -n gnome-control-center-%{version}
 
 %patch3 -p1 -b .no-gnome-common
-%patch8 -p1 -b .gtkmarshal
-%patch9 -p0 -b .set-https
 %patch10 -p0 -b .pam-fprintd
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
@@ -352,6 +342,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Feb  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.90-1
+- Update to 2.25.90
+
 * Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
 - Don't show enrollment for users if pam_fprintd isn't enabled in
   authconfig (#475804)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	18 Dec 2008 19:43:47 -0000	1.88
+++ sources	5 Feb 2009 05:12:54 -0000	1.89
@@ -1 +1 @@
-dfa363d8bf54496ef1b600ab36fe1782  gnome-control-center-2.25.3.tar.bz2
+26c9193ed7bc7061800af7058c6d1ce7  gnome-control-center-2.25.90.tar.bz2


--- gcc-set-https-handler.patch DELETED ---


--- gtkmarshal.patch DELETED ---