rpms/control-center/devel control-center-2.12.1-fedora-apps.patch, NONE, 1.1 control-center.spec, 1.96, 1.97

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.12.1-fedora-apps.patch 
Log Message:
2.12.1


control-center-2.12.1-fedora-apps.patch:
 gnome-default-applications-properties-structs.c |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE control-center-2.12.1-fedora-apps.patch ---
--- control-center-2.12.1/capplets/default-applications/gnome-default-applications-properties-structs.c.fedora-apps	2005-10-06 09:37:37.000000000 -0400
+++ control-center-2.12.1/capplets/default-applications/gnome-default-applications-properties-structs.c	2005-10-06 09:43:07.000000000 -0400
@@ -9,14 +9,12 @@
 	{ N_("Debian Sensible Browser"),	"sensible-browser",	"sensible-browser %s", FALSE, FALSE },
         { N_("Epiphany"), 		"epiphany",	"epiphany %s",		FALSE, FALSE },
         { N_("Galeon"), 		"galeon",	"galeon %s",		FALSE, FALSE },
-        { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
-        { N_("Firebird"),       "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
         { N_("Firefox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
-        { N_("Mozilla"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
         { N_("Mozilla"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-        { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
+        { N_("Netscape"), 	"netscape",	"netscape %s",		FALSE, FALSE },
         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
         { N_("W3M Text Browser"),	"w3m",		"w3m %s",		TRUE,  FALSE },
+	{ N_("Opera"),		"opera",	"opera %s",	FALSE, FALSE },
         { N_("Lynx Text Browser"),	"lynx",		"lynx %s",		TRUE,  FALSE },
         { N_("Links Text Browser") , 	"links",	"links %s",		TRUE,  FALSE }
 };
@@ -33,18 +31,13 @@
 	 * there is only one (the first entry in this list) Evolution entry 
 	 * in the list shown to the user
 	 */
-	{ N_("Evolution Mail Reader"),		"evolution-2.4",	"evolution-2.4 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-2.2",	"evolution-2.2 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-2.0",	"evolution-2.0 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-1.6",	"evolution-1.6 %s",	FALSE, FALSE, },
-	{ N_("Evolution Mail Reader"),		"evolution-1.5",	"evolution-1.5 %s",	FALSE, FALSE, },
-        { N_("Evolution Mail Reader"),		"evolution-1.4",	"evolution-1.4 %s",	FALSE, FALSE, },
         { N_("Evolution Mail Reader"),		"evolution",		"evolution %s",		FALSE, FALSE, },
 	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
 	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
-	{ N_("Thunderbird"), 			"thunderbird",		"thunderbird -mail %s", FALSE, FALSE},
-	{ N_("Thunderbird"), 			"mozilla-thunderbird",	"mozilla-thunderbird -mail %s", FALSE, FALSE},
+	{ N_("Thunderbird Mail"), 		"thunderbird",		"thunderbird -mail %s", FALSE, FALSE},
+	{ N_("Sylpheed"),			"sylpheed",		"sylpheed --compose %s", FALSE, FALSE },
 	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
+	{ N_("Opera Mail"),			"opera",		"opera", FALSE, FALSE },
         { N_("Mutt") , 	  			"mutt",			"mutt %s",		TRUE,  FALSE },
 
 };
@@ -58,7 +51,9 @@
 TerminalDescription possible_terminals[] = { 
         { N_("Debian Terminal Emulator"),	"x-terminal-emulator",	"-e", FALSE },
         { N_("GNOME Terminal"),		"gnome-terminal",	"-x", FALSE },
+	{ N_("KDE Konsole"),		"konsole",		"-e", FALSE },
         { N_("Standard XTerminal"),	"xterm",		"-e", FALSE },
+	{ N_("KTerm"),			"kterm",		"-e", FALSE },
         { N_("NXterm"),			"nxterm",		"-e", FALSE },
         { N_("RXVT"),			"rxvt",			"-e", FALSE },
         { N_("aterm"),			"aterm",		"-e", FALSE },


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- control-center.spec	6 Oct 2005 13:19:27 -0000	1.96
+++ control-center.spec	6 Oct 2005 13:45:18 -0000	1.97
@@ -26,7 +26,7 @@
 Group: User Interface/Desktops
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2
 
-Patch1: control-center-2.11.5-fedora-apps.patch
+Patch1: control-center-2.12.1-fedora-apps.patch
 Patch2: control-center-2.9.4-filesel.patch
 Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
 Patch4: control-center-2.12.0-help-left-handed-dual-mice-users.patch