rpms/control-center/devel .cvsignore, 1.104, 1.105 control-center.spec, 1.525, 1.526 sources, 1.108, 1.109

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3379

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.31.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	8 Jun 2010 14:58:53 -0000	1.104
+++ .cvsignore	30 Jun 2010 04:54:26 -0000	1.105
@@ -1 +1 @@
-gnome-control-center-2.31.3.tar.bz2
+gnome-control-center-2.31.4.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -p -r1.525 -r1.526
--- control-center.spec	23 Jun 2010 20:44:57 -0000	1.525
+++ control-center.spec	30 Jun 2010 04:54:26 -0000	1.526
@@ -1,7 +1,7 @@
 %define gettext_package gnome-control-center-2.0
 
 %define glib2_version 2.13.0
-%define gtk3_version 2.11.6
+%define gtk3_version 2.90.2
 %define gconf2_version 1.2.0
 %define gnome_desktop_version 2.29.3-2
 %define desktop_file_utils_version 0.9
@@ -17,8 +17,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.31.3
-Release: 2%{?dist}
+Version: 2.31.4
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -41,7 +41,7 @@ Requires: libXrandr >= %{libXrandr_versi
 BuildRequires: pango-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: librsvg3-devel
+BuildRequires: librsvg-devel
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
@@ -79,13 +79,6 @@ Requires(postun): shared-mime-info
 Provides: control-center-extra = %{epoch}:%{version}-%{release}
 Obsoletes: control-center-extra < 1:2.30.3-3
 
-# For GTK+ 3.x support
-BuildRequires: automake autoconf gnome-common libtool intltool
-Patch0: 0001-Use-gtk-3.0.patch
-Patch1: 0001-You-can-t-mix-GTK2-and-GTK3-so-depend-on-gtk-3.0-ver.patch
-Patch2: 0001-Convert-from-libunique-to-GtkApplication-to-remove-t.patch
-Patch3: 0001-Use-gnome-desktop-3.0-not-2.0.patch
-
 %description
 This package contains configuration utilities for the GNOME desktop, which
 allow to configure accessibility options, desktop fonts, keyboard and mouse
@@ -121,12 +114,6 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
-%patch0 -p1 -b .gtk3
-%patch1 -p1 -b .gd1
-%patch2 -p1 -b .gtk-app
-%patch3 -p1 -b .gd2
-
-aclocal --force && automake -f && libtoolize -f && autoconf -f
 
 %build
 %configure \
@@ -248,6 +235,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen at redhat.com> 2.31.4-1
+- Update to 2.31.4
+
 * Wed Jun 23 2010 Bastien Nocera <bnocera at redhat.com> 2.31.3-2
 - Add patches to compile against GTK+ 3.x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	8 Jun 2010 14:58:53 -0000	1.108
+++ sources	30 Jun 2010 04:54:27 -0000	1.109
@@ -1 +1 @@
-bc38f41bb2b630c9dc86ccc95ac3511f  gnome-control-center-2.31.3.tar.bz2
+42122fa193ca2aedd778298580151b7b  gnome-control-center-2.31.4.tar.bz2