rpms/control-center/devel .cvsignore, 1.26, 1.27 control-center.spec, 1.90, 1.91 sources, 1.29, 1.30

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Sep 7 18:25:27 UTC 2005


Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27884

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	10 Aug 2005 13:40:28 -0000	1.26
+++ .cvsignore	7 Sep 2005 18:25:24 -0000	1.27
@@ -1 +1,2 @@
 control-center-2.11.91.tar.bz2
+control-center-2.12.0.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- control-center.spec	31 Aug 2005 19:29:36 -0000	1.90
+++ control-center.spec	7 Sep 2005 18:25:24 -0000	1.91
@@ -19,8 +19,8 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.11.91
-Release: 4
+Version: 2.12.0
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -29,11 +29,7 @@
 Patch2: control-center-2.11.5-fedora-apps.patch
 Patch3: control-center-2.9.4-filesel.patch
 Patch4: control-center-2.10.1-mark-tool-buttons-important.patch
-# patch out the xft 2.1.7 requirement until we ship modular xorg
-Patch6: control-center-2.11.6-xft.patch
-Patch7: control-center-2.11.91-fix-about-me-disablement.patch
 Patch8: control-center-2.11.91-help-left-handed-dual-mice-users.patch
-Patch9: control-center-2.11.91-dont-use-pango-xft.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -93,10 +89,7 @@
 %patch2 -p1 -b .fedora-apps
 %patch3 -p1 -b .filesel
 %patch4 -p1 -b .mark-tool-buttons-important
-%patch6 -p1 -b .xft
-%patch7 -p1 -b .fix-about-me-disablement
 %patch8 -p1 -b .help-left-handed-dual-mice-users
-%patch9 -p1 -b .dont-use-pango-xft
 
 %build
 
@@ -207,6 +200,10 @@
 # (also its headers)
 
 %changelog
+* Wed Sep  7 2005 Matthias Clasen <mclasen at redhat.com> - 1:2.12.0-1
+- Update to 2.12.0
+- Drop upstreamed patches
+
 * Wed Aug 31 2005 Ray Strode <rstrode at redhat.com> - 1:2.11.91-4
 - Potentially fix tablet bustage (bug 167227)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Aug 2005 13:40:28 -0000	1.29
+++ sources	7 Sep 2005 18:25:24 -0000	1.30
@@ -1 +1 @@
-a429f605878160e2660725bad2ee1e17  control-center-2.11.91.tar.bz2
+06a213f801bff26cee4f5db03a54da08  control-center-2.12.0.tar.bz2




More information about the fedora-cvs-commits mailing list