rpms/control-center/devel .cvsignore, 1.84, 1.85 control-center.spec, 1.424, 1.425 sources, 1.87, 1.88 gcc-enroll-stages.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

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

Modified Files:
	.cvsignore control-center.spec sources 
Removed Files:
	gcc-enroll-stages.patch 
Log Message:
* Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-1
- Update to 2.25.3
- Drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	4 Dec 2008 15:59:46 -0000	1.84
+++ .cvsignore	18 Dec 2008 19:43:47 -0000	1.85
@@ -1 +1 @@
-gnome-control-center-2.25.2.tar.bz2
+gnome-control-center-2.25.3.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- control-center.spec	18 Dec 2008 16:25:51 -0000	1.424
+++ control-center.spec	18 Dec 2008 19:43:47 -0000	1.425
@@ -21,17 +21,14 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.25.2
-Release: 9%{?dist}
+Version: 2.25.3
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/2.25/gnome-control-center-%{version}.tar.bz2
 Source1: org.gnome.control-center.defaultbackground.policy
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=562504
-Patch1: gcc-enroll-stages.patch
-
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
 Patch7: make-default.patch
@@ -163,9 +160,6 @@
 %prep
 %setup -q -n gnome-control-center-%{version}
 
-pushd capplets/about-me
-%patch1 -p0 -b .num-enroll-stages
-popd
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
 %patch22 -p0 -b .slab-icon-names
@@ -242,13 +236,6 @@
 # remove useless libtool archive files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
-# And until we get a new g-c-c package without the sound capplet,
-# remove those by hand.
-rm $RPM_BUILD_ROOT%{_bindir}/gnome-sound-properties					\
-	$RPM_BUILD_ROOT%{_datadir}/applications/gnome-settings-sound.desktop		\
-	$RPM_BUILD_ROOT%{_datadir}/gnome-control-center/glade/sound-properties.glade	\
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps/gnome-sound-properties.*
-
 %find_lang %{gettext_package} --all-name --with-gnome
 
 %clean
@@ -353,6 +340,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-1
+- Update to 2.25.3
+- Drop upstreamed patches
+
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.2-9
 - Remove the sound capplet by hand, will be gone in the next upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	4 Dec 2008 15:59:47 -0000	1.87
+++ sources	18 Dec 2008 19:43:47 -0000	1.88
@@ -1 +1 @@
-d501bac60fa26b3baa9ad17352f47c8b  gnome-control-center-2.25.2.tar.bz2
+dfa363d8bf54496ef1b600ab36fe1782  gnome-control-center-2.25.3.tar.bz2


--- gcc-enroll-stages.patch DELETED ---