[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/control-center/devel control-center-2.11.5-acme-dummy.patch, NONE, 1.1 control-center-2.11.5-fedora-apps.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 control-center.spec, 1.71, 1.72 sources, 1.25, 1.26



Author: mclasen

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

Modified Files:
	.cvsignore control-center.spec sources 
Added Files:
	control-center-2.11.5-acme-dummy.patch 
	control-center-2.11.5-fedora-apps.patch 
Log Message:
Update to 2.11.5


control-center-2.11.5-acme-dummy.patch:
 Makefile.am |    3 ++-
 Makefile.in |   16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE control-center-2.11.5-acme-dummy.patch ---
--- control-center-2.11.5/gnome-settings-daemon/actions/Makefile.am.acme-dummy	2005-07-08 15:38:40.965921000 -0400
+++ control-center-2.11.5/gnome-settings-daemon/actions/Makefile.am	2005-07-08 15:39:03.955910000 -0400
@@ -3,7 +3,8 @@
 noinst_LTLIBRARIES = libacme.la
 
 libacme_la_SOURCES = \
-	acme-volume.c acme-volume.h
+	acme-volume.c acme-volume.h \
+	acme-volume-dummy.c acme-volume-dummy.h
 
 libacme_la_LIBADD = 
 
--- control-center-2.11.5/gnome-settings-daemon/actions/Makefile.in.acme-dummy	2005-07-08 15:38:48.809070000 -0400
+++ control-center-2.11.5/gnome-settings-daemon/actions/Makefile.in	2005-07-08 15:39:17.664186000 -0400
@@ -296,7 +296,8 @@
 noinst_LTLIBRARIES = libacme.la
 
 libacme_la_SOURCES = \
-	acme-volume.c acme-volume.h\
+	acme-volume.c acme-volume.h \
+	acme-volume-dummy.c acme-volume-dummy.h\
 $(am__append_2) $(am__append_5) $(am__append_8) $(am__append_9) $(am__append_11)
 
 libacme_la_LIBADD = $(am__append_3) $(am__append_6)
@@ -330,10 +331,10 @@
 @HAVE_ALSA_TRUE@@HAVE_GSTREAMER_TRUE libacme_la_DEPENDENCIES =
 @HAVE_ALSA_TRUE@@HAVE_GSTREAMER_FALSE libacme_la_DEPENDENCIES =
 am__libacme_la_SOURCES_DIST = acme-volume.c acme-volume.h \
-	acme-volume-gstreamer.c acme-volume-gstreamer.h \
-	acme-volume-alsa.c acme-volume-alsa.h acme-volume-oss.c \
-	acme-volume-oss.h acme-volume-dummy.c acme-volume-dummy.h \
-	acme-fb-level.c acme-fb-level.h
+	acme-volume-dummy.c acme-volume-dummy.h acme-volume-gstreamer.c \
+	acme-volume-gstreamer.h acme-volume-alsa.c acme-volume-alsa.h \
+	acme-volume-oss.c acme-volume-oss.h acme-fb-level.c \
+	acme-fb-level.h
 @HAVE_GSTREAMER_TRUE am__objects_1 = acme-volume-gstreamer.lo \
 @HAVE_GSTREAMER_TRUE@	acme-volume-gstreamer.lo
 @HAVE_ALSA_TRUE@@HAVE_GSTREAMER_FALSE am__objects_2 = \
@@ -343,8 +344,9 @@
 @HAVE_ALSA_FALSE@@HAVE_GSTREAMER_FALSE@@HAVE_OSS_FALSE am__objects_4 = \
 @HAVE_ALSA_FALSE@@HAVE_GSTREAMER_FALSE@@HAVE_OSS_FALSE@	acme-volume-dummy.lo
 @HAVE_FB_TRUE am__objects_5 = acme-fb-level.lo
-am_libacme_la_OBJECTS = acme-volume.lo $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5)
+am_libacme_la_OBJECTS = acme-volume.lo acme-volume-dummy.lo \
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4) $(am__objects_5)
 libacme_la_OBJECTS = $(am_libacme_la_OBJECTS)
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)

control-center-2.11.5-fedora-apps.patch:
 gnome-default-applications-properties-structs.c |   25 +++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

--- NEW FILE control-center-2.11.5-fedora-apps.patch ---
--- control-center-2.11.5/capplets/default-applications/gnome-default-applications-properties-structs.c.fedora-apps	2005-05-22 11:59:59.000000000 -0400
+++ control-center-2.11.5/capplets/default-applications/gnome-default-applications-properties-structs.c	2005-07-08 13:59:37.897806000 -0400
@@ -6,17 +6,15 @@
 	gboolean in_path;
 };
 BrowserDescription possible_browsers[] = {
-	{ 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_("Mozill"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
+        { N_("Netscape"), 	"netscape",	"netscape %s",		FALSE, FALSE },
         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
+        { N_("Opera"), 		"opera",	"opera %s",		FALSE, FALSE },
         { N_("W3M Text Browser"),	"w3m",		"w3m %s",		TRUE,  FALSE },
+     
         { N_("Lynx Text Browser"),	"lynx",		"lynx %s",		TRUE,  FALSE },
         { N_("Links Text Browser") , 	"links",	"links %s",		TRUE,  FALSE }
 };
@@ -33,17 +31,14 @@
 	 * 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.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 },
 
 };
@@ -55,11 +50,11 @@
 	gboolean in_path;
 };
 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 },
         { N_("ETerm"),			"Eterm",		"-e", FALSE }
 };


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	8 Apr 2005 19:14:36 -0000	1.22
+++ .cvsignore	8 Jul 2005 19:50:45 -0000	1.23
@@ -1 +1,2 @@
 control-center-2.10.1.tar.bz2
+control-center-2.11.5.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- control-center.spec	23 May 2005 18:13:08 -0000	1.71
+++ control-center.spec	8 Jul 2005 19:50:45 -0000	1.72
@@ -1,7 +1,7 @@
 %define gettext_package control-center-2.0
 
 %define pango_version 1.0.99.020703
-%define gtk2_version 2.3.0
+%define gtk2_version 2.6.0
 %define gconf2_version 1.2.0
 %define gnome_desktop_version 2.3.0
 %define libgnome_version 2.3.0
@@ -10,27 +10,26 @@
 %define libbonoboui_version 2.3.0
 %define gnome_vfs2_version 2.3.0
 %define desktop_file_utils_version 0.9
-%define xft_version 1.9.1.020708.0036
-%define fontconfig_version 0.0.1.020626.1517-2
+%define xft_version 2.0.0
+%define fontconfig_version 1.0.0
 %define redhat_menus_version 1.8
 %define metacity_version 2.5.3
 %define libxklavier_version 1.14
-%define gnome_menus_version 2.10.1
+%define gnome_menus_version 2.11.1
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.10.1
-Release: 6
+Version: 2.11.5
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2
 
-Patch2: control-center-2.9.4-fedora-apps.patch
+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
-Patch5: control-center-2.10.1-icon.patch
-Patch6: control-center-2.10.1-fix-popunder-bug.patch
+Patch5: control-center-2.11.5-acme-dummy.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -90,8 +89,7 @@
 %patch2 -p1 -b .fedora-apps
 %patch3 -p1 -b .filesel
 %patch4 -p1 -b .mark-tool-buttons-important
-%patch5 -p1 -b .icon
-%patch6 -p1 -b .fix-popunder-bug
+%patch5 -p1 -b .acme-dummy
 
 %build
 
@@ -194,6 +192,9 @@
 # (also its headers)
 
 %changelog
+* Fri Jul  8 2005 Matthias Clasen <mclasen redhat com> - 1:2.11.5-1
+- Update to 2.11.5
+
 * Mon May 23 2005 Bill Nottingham <notting redhat com> - 1:2.10.1-6
 - don't ship static versions of nautilus extensions
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Apr 2005 19:14:36 -0000	1.25
+++ sources	8 Jul 2005 19:50:45 -0000	1.26
@@ -1 +1 @@
-d95a5746aa349536dc0f59c61cdaf19f  control-center-2.10.1.tar.bz2
+2e6f3a42b2ccf1cf57fa8a49841e919c  control-center-2.11.5.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]