Author: goetz
Date: Tue Dec 5 14:01:36 2006
New Revision: 90917
Added:
packages/cooker/gnome-control-center/current/SOURCES/control-center-2.17.3.tar.bz2
(contents, props changed)
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.3-menulocation.patch
- copied unchanged from r89223,
/packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.2-menulocation.patch
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.3-menulocation.patch
- copied, changed from r90779,
/packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.2-menulocation.patch
Removed:
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.2-menulocation.patch
Modified:
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
Log:
- new version
- rediff menu location patch
- remove icons
- fix buildrequires
Added:
packages/cooker/gnome-control-center/current/SOURCES/control-center-2.17.3.tar.bz2
==============================================================================
Binary file. No diff available.
Copied:
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.3-menulocation.patch
(from r90779,
/packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.2-menulocation.patch)
==============================================================================
---
/packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.13.2-menulocation.patch
(original)
+++
packages/cooker/gnome-control-center/current/SOURCES/gnome-control-center-2.17.3-menulocation.patch
Tue Dec 5 14:01:36 2006
@@ -1,29 +1,31 @@
---- control-center-2.13.2/control-center/control-center.c.menulocation
2005-11-14 16:21:11.000000000 +0100
-+++ control-center-2.13.2/control-center/control-center.c 2005-11-16
00:49:20.000000000 +0100
-@@ -71,10 +71,26 @@
+--- control-center-2.17.3/shell/control-center.c.menulocation 2006-11-13
09:33:07.000000000 +0100
++++ control-center-2.17.3/shell/control-center.c 2006-12-05
12:16:53.000000000 +0100
+@@ -104,6 +104,7 @@
int
main (int argc, char *argv[])
{
-+ const char *xdg_config_dirs;
-+
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
++ const char *xdg_config_dirs;
+ BonoboApplication *bonobo_app = NULL;
+ gboolean hidden = FALSE;
+ gchar * startup_id;
+@@ -114,6 +115,20 @@
+ textdomain (GETTEXT_PACKAGE);
+ #endif
-+ xdg_config_dirs = g_getenv ("XDG_CONFIG_DIRS");
-+ if (xdg_config_dirs && *xdg_config_dirs != '\0') {
-+ if (!strstr (xdg_config_dirs, "/etc/xdg/gnome")) {
-+ char * new_xdg_config_dirs;
-+
-+ new_xdg_config_dirs = g_strconcat (xdg_config_dirs,
":/etc/xdg/gnome", NULL);
-+ g_setenv ("XDG_CONFIG_DIRS", new_xdg_config_dirs, TRUE);
-+ g_free (new_xdg_config_dirs);
-+ }
-+ }
-+ else {
-+ g_setenv ("XDG_CONFIG_DIRS", "/etc/xdg/gnome", TRUE);
-+ }
-+
- gnome_program_init ("gnome-control-center",
- VERSION, LIBGNOMEUI_MODULE,
- argc, argv,
++ xdg_config_dirs = g_getenv ("XDG_CONFIG_DIRS");
++ if (xdg_config_dirs && *xdg_config_dirs != '\0') {
++ if (!strstr (xdg_config_dirs, "/etc/xdg/gnome")) {
++ char * new_xdg_config_dirs;
++
++ new_xdg_config_dirs = g_strconcat (xdg_config_dirs,
":/etc/xdg/gnome", NULL);
++ g_setenv ("XDG_CONFIG_DIRS", new_xdg_config_dirs, TRUE);
++ g_free (new_xdg_config_dirs);
++ }
++ }
++ else {
++ g_setenv ("XDG_CONFIG_DIRS", "/etc/xdg/gnome", TRUE);
++ }
++
+ if (argc > 1)
+ {
+ if (argc != 2 || strcmp ("-h", argv[1]))
Modified:
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
==============================================================================
---
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
(original)
+++
packages/cooker/gnome-control-center/current/SPECS/gnome-control-center.spec
Tue Dec 5 14:01:36 2006
@@ -5,8 +5,8 @@
Summary: GNOME control center
Name: gnome-%{pkgname}
-Version: 2.17.1
-Release: %mkrel 3
+Version: 2.17.3
+Release: %mkrel 1
License: GPL
Group: Graphical desktop/GNOME
BuildRequires: evolution-data-server-devel >= 1.5.3
@@ -21,6 +21,9 @@
BuildRequires: libgstreamer-plugins-base-devel
BuildRequires: libxscrnsaver-devel
BuildRequires: hal-devel
+BuildRequires: libgnomekbd-devel
+BuildRequires: gnome-panel-devel
+BuildRequires: librsvg-devel
BuildRequires: desktop-file-utils
BuildRequires: perl-XML-Parser
BuildRequires: automake1.8
@@ -38,7 +41,7 @@
# (fc) 2.8.2-5mdk fix keybinding when keysim aren't available
Patch13: gnome-control-center-2.8.2-badkeysim.patch
# (fc) 2.10.2-2mdk display icons when control-center is not started from GNOME
(Mdk bug #16767)
-Patch16: gnome-control-center-2.13.2-menulocation.patch
+Patch16: gnome-control-center-2.17.3-menulocation.patch
Requires: gstreamer0.10-plugins-base
Requires: gstreamer0.10-plugins-good
Obsoletes: %{pkgname}
@@ -161,7 +164,6 @@
%post_install_gconf_schemas %schemas
%{update_menus}
%update_desktop_database
-%update_icon_cache hicolor
%preun
%preun_uninstall_gconf_schemas %schemas
@@ -169,7 +171,6 @@
%postun
%{clean_menus}
%clean_desktop_database
-%clean_icon_cache hicolor
%post -p /sbin/ldconfig -n %{lib_name}
@@ -216,7 +217,6 @@
%{_datadir}/pixmaps/*
%{_datadir}/idl/*
%{_menudir}/*
-%{_iconsdir}/hicolor/48x48/apps/*
%{_datadir}/omf/*
%files -n %{lib_name}
