From 462a4057a091cca688a506612e3810b0c4d8bb42 Mon Sep 17 00:00:00 2001 From: Artur Frysiak Date: Sat, 5 Feb 2011 23:11:15 +0000 Subject: [PATCH] - obsoleted by gnome-control-center.spec Changed files: control-center-Makefile.patch -> 1.4 control-center-additional-metacity-keybinding.patch -> 1.3 control-center-capplet.patch -> 1.7 control-center-compiz-support.patch -> 1.2 control-center-default_apps.patch -> 1.3 control-center-randr.patch -> 1.2 control-center-wm_properties-dir.patch -> 1.2 control-center.spec -> 1.210 --- control-center-Makefile.patch | 22 -- ...enter-additional-metacity-keybinding.patch | 25 -- control-center-capplet.patch | 180 ------------ control-center-compiz-support.patch | 52 ---- control-center-default_apps.patch | 26 -- control-center-randr.patch | 16 -- control-center-wm_properties-dir.patch | 14 - control-center.spec | 267 ------------------ 8 files changed, 602 deletions(-) delete mode 100644 control-center-Makefile.patch delete mode 100644 control-center-additional-metacity-keybinding.patch delete mode 100644 control-center-capplet.patch delete mode 100644 control-center-compiz-support.patch delete mode 100644 control-center-default_apps.patch delete mode 100644 control-center-randr.patch delete mode 100644 control-center-wm_properties-dir.patch delete mode 100644 control-center.spec diff --git a/control-center-Makefile.patch b/control-center-Makefile.patch deleted file mode 100644 index 05776d3..0000000 --- a/control-center-Makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN control-center-2.10.0.orig/vfs-methods/fontilus/Makefile.am control-center-2.10.0/vfs-methods/fontilus/Makefile.am ---- control-center-2.10.0.orig/vfs-methods/fontilus/Makefile.am 2005-04-01 11:37:13.000000000 +0200 -+++ control-center-2.10.0/vfs-methods/fontilus/Makefile.am 2005-04-01 11:41:14.000000000 +0200 -@@ -50,7 +50,6 @@ - endif - - install-desktop-database: install-desktopDATA -- update-desktop-database $(DESTDIR)$(desktopdir) - - uninstall-local: - rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache -diff -urN control-center-2.10.0.orig/vfs-methods/themus/Makefile.am control-center-2.10.0/vfs-methods/themus/Makefile.am ---- control-center-2.10.0.orig/vfs-methods/themus/Makefile.am 2005-04-01 11:37:13.000000000 +0200 -+++ control-center-2.10.0/vfs-methods/themus/Makefile.am 2005-04-01 11:41:38.000000000 +0200 -@@ -71,7 +71,6 @@ - endif - - install-desktop-database: install-desktopDATA -- update-desktop-database $(DESTDIR)$(desktopdir) - - distclean-local: - rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache diff --git a/control-center-additional-metacity-keybinding.patch b/control-center-additional-metacity-keybinding.patch deleted file mode 100644 index 27a4cae..0000000 --- a/control-center-additional-metacity-keybinding.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN control-center-2.17.92/capplets/keybindings/gnome-keybinding-properties.c control-center-2.17.92.new/capplets/keybindings/gnome-keybinding-properties.c ---- control-center-2.17.92/capplets/keybindings/gnome-keybinding-properties.c 2007-02-26 20:39:50.000000000 +0100 -+++ control-center-2.17.92.new/capplets/keybindings/gnome-keybinding-properties.c 2007-03-03 11:13:11.000000000 +0100 -@@ -77,6 +77,7 @@ - { "/apps/metacity/window_keybindings/begin_resize", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/window_keybindings/toggle_on_all_workspaces", N_WORKSPACES_GT, 1 }, - /* These next three are out of order compared to the schemas file. */ -+ { "/apps/metacity/window_keybindings/toggle_above", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/window_keybindings/raise_or_lower", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/window_keybindings/raise", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/window_keybindings/lower", ALWAYS_VISIBLE, 0 }, -@@ -99,10 +100,13 @@ - { "/apps/metacity/window_keybindings/move_to_workspace_up", N_WORKSPACES_GT, 1 }, - { "/apps/metacity/window_keybindings/move_to_workspace_down", N_WORKSPACES_GT, 1 }, - { "/apps/metacity/global_keybindings/switch_windows", ALWAYS_VISIBLE, 0 }, -+ { "/apps/metacity/global_keybindings/switch_windows_backwards", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/switch_panels", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/cycle_windows", ALWAYS_VISIBLE, 0 }, -+ { "/apps/metacity/global_keybindings/cycle_windows_backward", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/cycle_group", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/cycle_panels", ALWAYS_VISIBLE, 0 }, -+ { "/apps/metacity/global_keybindings/cycle_panels_backward", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/show_desktop", ALWAYS_VISIBLE, 0 }, - { "/apps/metacity/global_keybindings/switch_to_workspace_1", N_WORKSPACES_GT, 1 }, - { "/apps/metacity/global_keybindings/switch_to_workspace_2", N_WORKSPACES_GT, 1 }, diff --git a/control-center-capplet.patch b/control-center-capplet.patch deleted file mode 100644 index df339c9..0000000 --- a/control-center-capplet.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -aurN control-center-2.13.90.orig/capplets/about-me/gnome-about-me.desktop.in.in control-center-2.13.90/capplets/about-me/gnome-about-me.desktop.in.in ---- control-center-2.13.90.orig/capplets/about-me/gnome-about-me.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/about-me/gnome-about-me.desktop.in.in 2006-01-30 22:34:18.650754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; -+Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in control-center-2.13.90/capplets/accessibility/at-properties/at-properties.desktop.in.in ---- control-center-2.13.90.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/accessibility/at-properties/at-properties.desktop.in.in 2006-01-30 22:34:36.710754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility; -+Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.13.90/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in ---- control-center-2.13.90.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-01-30 22:35:01.620754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility; -+Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/background/background.desktop.in.in control-center-2.13.90/capplets/background/background.desktop.in.in ---- control-center-2.13.90.orig/capplets/background/background.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/background/background.desktop.in.in 2006-01-30 22:35:18.440754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;DesktopSettings; -+Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/default-applications/default-applications.desktop.in.in control-center-2.13.90/capplets/default-applications/default-applications.desktop.in.in ---- control-center-2.13.90.orig/capplets/default-applications/default-applications.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/default-applications/default-applications.desktop.in.in 2006-01-30 22:35:43.670754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; -+Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/display/display-properties.desktop.in.in control-center-2.13.90/capplets/display/display-properties.desktop.in.in ---- control-center-2.13.90.orig/capplets/display/display-properties.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/display/display-properties.desktop.in.in 2006-01-30 22:43:44.960754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;HardwareSettings; -+Categories=GTK;GNOME;Settings;HardwareSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/font/font-properties.desktop.in.in control-center-2.13.90/capplets/font/font-properties.desktop.in.in ---- control-center-2.13.90.orig/capplets/font/font-properties.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/font/font-properties.desktop.in.in 2006-01-30 22:44:52.430754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;DesktopSettings; -+Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/keybindings/keybinding.desktop.in.in control-center-2.13.90/capplets/keybindings/keybinding.desktop.in.in ---- control-center-2.13.90.orig/capplets/keybindings/keybinding.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/keybindings/keybinding.desktop.in.in 2006-01-30 22:45:11.700754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; -+Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/keyboard/keyboard.desktop.in.in control-center-2.13.90/capplets/keyboard/keyboard.desktop.in.in ---- control-center-2.13.90.orig/capplets/keyboard/keyboard.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/keyboard/keyboard.desktop.in.in 2006-01-30 22:45:41.620754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;HardwareSettings; -+Categories=GTK;GNOME;Settings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in control-center-2.13.90/capplets/mouse/gnome-settings-mouse.desktop.in.in ---- control-center-2.13.90.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/mouse/gnome-settings-mouse.desktop.in.in 2006-01-30 22:45:55.270754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;HardwareSettings; -+Categories=GTK;GNOME;Settings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/network/gnome-network-preferences.desktop.in.in control-center-2.13.90/capplets/network/gnome-network-preferences.desktop.in.in ---- control-center-2.13.90.orig/capplets/network/gnome-network-preferences.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/network/gnome-network-preferences.desktop.in.in 2006-01-30 22:46:08.550754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; -+Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/sound/gnome-settings-sound.desktop.in.in control-center-2.13.90/capplets/sound/gnome-settings-sound.desktop.in.in ---- control-center-2.13.90.orig/capplets/sound/gnome-settings-sound.desktop.in.in 2006-01-29 21:13:17.000000000 +0100 -+++ control-center-2.13.90/capplets/sound/gnome-settings-sound.desktop.in.in 2006-01-30 22:46:22.590754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;HardwareSettings; -+Categories=GTK;GNOME;Settings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in.in control-center-2.13.90/capplets/theme-switcher/gtk-theme-selector.desktop.in.in ---- control-center-2.13.90.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/theme-switcher/gtk-theme-selector.desktop.in.in 2006-01-30 22:46:41.190754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;DesktopSettings; -+Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/ui-properties/gnome-ui-properties.desktop.in.in control-center-2.13.90/capplets/ui-properties/gnome-ui-properties.desktop.in.in ---- control-center-2.13.90.orig/capplets/ui-properties/gnome-ui-properties.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/ui-properties/gnome-ui-properties.desktop.in.in 2006-01-30 22:47:11.520754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;DesktopSettings; -+Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -aurN control-center-2.13.90.orig/capplets/windows/window-properties.desktop.in.in control-center-2.13.90/capplets/windows/window-properties.desktop.in.in ---- control-center-2.13.90.orig/capplets/windows/window-properties.desktop.in.in 2006-01-23 12:36:20.000000000 +0100 -+++ control-center-2.13.90/capplets/windows/window-properties.desktop.in.in 2006-01-30 22:47:26.940754000 +0100 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;GTK;Settings;DesktopSettings; -+Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center diff --git a/control-center-compiz-support.patch b/control-center-compiz-support.patch deleted file mode 100644 index bb53733..0000000 --- a/control-center-compiz-support.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c.orig 2006-08-15 18:56:34.000000000 -0400 -+++ control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c 2006-08-15 18:56:45.000000000 -0400 -@@ -64,6 +64,28 @@ - { NULL } - }; - -+#define COMPIZ_KEY(k) { "/apps/compiz/general/allscreens/options/" #k, ALWAYS_VISIBLE, 0 } -+ -+static const KeyListEntry compiz_key_list[] = -+{ -+ COMPIZ_KEY (close_window), -+ COMPIZ_KEY (lower_window), -+ COMPIZ_KEY (main_menu), -+ COMPIZ_KEY (maximize_window), -+ COMPIZ_KEY (maximize_window_horizontally), -+ COMPIZ_KEY (maximize_window_vertically), -+ COMPIZ_KEY (minimize_window), -+ COMPIZ_KEY (opacity_decrease), -+ COMPIZ_KEY (opacity_increase), -+ COMPIZ_KEY (show_desktop), -+ COMPIZ_KEY (toggle_window_maximized), -+ COMPIZ_KEY (toggle_window_maximized_horizontally), -+ COMPIZ_KEY (toggle_window_maximized_vertically), -+ COMPIZ_KEY (toggle_window_shaded), -+ COMPIZ_KEY (unmaximize_window), -+ COMPIZ_KEY (window_menu), -+}; -+ - static const KeyListEntry metacity_key_list[] = - { - { "/apps/metacity/window_keybindings/activate_window_menu", ALWAYS_VISIBLE, 0 }, -@@ -559,6 +581,10 @@ - { - append_keys_to_tree (dialog, _("Window Management"), metacity_key_list); - } -+ else if (strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0) -+ { -+ append_keys_to_tree (dialog, _("Window Management"), compiz_key_list); -+ } - } - - static void ---- control-center-2.15.91/capplets/common/wm-common.h.orig 2006-08-15 18:56:14.000000000 -0400 -+++ control-center-2.15.91/capplets/common/wm-common.h 2006-08-15 18:56:45.000000000 -0400 -@@ -2,6 +2,7 @@ - #define WM_COMMON_H - - #define WM_COMMON_METACITY "Metacity" -+#define WM_COMMON_COMPIZ "compiz" - #define WM_COMMON_SAWFISH "Sawfish" - #define WM_COMMON_UNKNOWN "Unknown" - diff --git a/control-center-default_apps.patch b/control-center-default_apps.patch deleted file mode 100644 index e7b781e..0000000 --- a/control-center-default_apps.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -aurN control-center-2.13.90.orig/capplets/default-applications/gnome-default-applications.xml.in control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in ---- control-center-2.13.90.orig/capplets/default-applications/gnome-default-applications.xml.in 2006-01-28 19:52:24.000000000 +0100 -+++ control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in 2006-01-30 22:30:19.530754000 +0100 -@@ -64,7 +64,7 @@ - - <_name>Firefox - firefox -- firefox %s -+ mozilla-firefox %s - firefox - false - true -@@ -234,6 +234,13 @@ - sylpheed - false - -+ -+ <_name>Sylpheed -+ sylpheed -+ sylpheed --compose %s -+ sylpheed -+ false -+ - - - diff --git a/control-center-randr.patch b/control-center-randr.patch deleted file mode 100644 index e063c40..0000000 --- a/control-center-randr.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN control-center-2.3.5.orig/configure.in control-center-2.3.5/configure.in ---- control-center-2.3.5.orig/configure.in Thu Aug 14 23:00:28 2003 -+++ control-center-2.3.5/configure.in Thu Aug 14 23:17:06 2003 -@@ -93,10 +93,10 @@ - AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, - [AC_CHECK_HEADER(X11/extensions/Xrandr.h, - have_randr=yes -- RANDR_LIBS="-lXrandr -lXrender" -+ RANDR_LIBS="-lXrandr -lXrender -lXext" - AC_DEFINE(HAVE_RANDR, 1, Have the Xrandr extension library), - :, [#include ])], : , -- -lXrandr -lXrender $x_libs) -+ -lXrandr -lXrender -lXext $x_libs) - AM_CONDITIONAL(HAVE_RANDR, [test $have_randr = yes]) - - PKG_CHECK_MODULES(DISPLAY_CAPPLET, $COMMON_MODULES) diff --git a/control-center-wm_properties-dir.patch b/control-center-wm_properties-dir.patch deleted file mode 100644 index 68df55c..0000000 --- a/control-center-wm_properties-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuard control-center-2.4.0.orig/libwindow-settings/gnome-wm-manager.c control-center-2.4.0/libwindow-settings/gnome-wm-manager.c ---- control-center-2.4.0.orig/libwindow-settings/gnome-wm-manager.c 2002-10-29 07:19:52.000000000 +0100 -+++ control-center-2.4.0/libwindow-settings/gnome-wm-manager.c 2003-09-20 19:43:04.000000000 +0200 -@@ -230,6 +230,10 @@ - tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); - scan_wm_directory (tempdir, FALSE); - g_free (tempdir); -+ -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); -+ scan_wm_directory (tempdir, FALSE); -+ g_free (tempdir); - - tempdir = gnome_util_home_file("wm-properties/"); - scan_wm_directory (tempdir, TRUE); diff --git a/control-center.spec b/control-center.spec deleted file mode 100644 index 5db9d58..0000000 --- a/control-center.spec +++ /dev/null @@ -1,267 +0,0 @@ -Summary: GNOME Control Center -Summary(es.UTF-8): El centro de controle del GNOME -Summary(pl.UTF-8): Centrum Kontroli GNOME -Summary(pt_BR.UTF-8): O Centro de Controle do GNOME -Summary(ru.UTF-8): Центр управления GNOME -Summary(uk.UTF-8): Центр керування GNOME -Name: control-center -Version: 2.18.1 -Release: 3 -Epoch: 1 -License: GPL v2+ -Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.18/%{name}-%{version}.tar.bz2 -# Source0-md5: bae0fd0f9e32f374bd7236d98788b13f -Patch0: %{name}-randr.patch -Patch1: %{name}-wm_properties-dir.patch -Patch2: %{name}-additional-metacity-keybinding.patch -Patch3: %{name}-default_apps.patch -Patch4: %{name}-capplet.patch -Patch5: %{name}-Makefile.patch -Patch6: %{name}-compiz-support.patch -URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.18.0.1 -BuildRequires: alsa-lib-devel >= 1.0.12 -BuildRequires: audiofile >= 1:0.2.6 -BuildRequires: autoconf -BuildRequires: automake >= 1:1.9 -BuildRequires: bison -BuildRequires: dbus-glib-devel >= 0.73 -BuildRequires: esound-devel -BuildRequires: evolution-data-server-devel >= 1.10.1 -BuildRequires: flex -BuildRequires: gettext-devel -BuildRequires: gnome-common >= 2.18.0 -BuildRequires: gnome-desktop-devel >= 2.18.0 -BuildRequires: gnome-doc-utils >= 0.10.3 -BuildRequires: gnome-menus-devel >= 2.18.0 -BuildRequires: gnome-panel-devel >= 2.18.0 -BuildRequires: gnome-vfs2-devel >= 2.18.1 -BuildRequires: gstreamer-plugins-base-devel >= 0.10.10 -BuildRequires: gtk+2-devel >= 2:2.10.10 -BuildRequires: intltool >= 0.35.5 -BuildRequires: libglade2-devel >= 1:2.6.0 -BuildRequires: libgnomekbd-devel >= 2.18.1 -BuildRequires: libgnomeui-devel >= 2.18.1 -BuildRequires: librsvg-devel >= 2.16.1 -BuildRequires: libtool -BuildRequires: libxml2-devel >= 1:2.6.27 -BuildRequires: metacity-devel >= 2:2.18.2 -BuildRequires: nautilus-devel >= 2.18.1 -BuildRequires: pkgconfig -BuildRequires: rpmbuild(macros) >= 1.311 -BuildRequires: scrollkeeper -BuildRequires: xorg-lib-libXScrnSaver-devel -BuildRequires: xorg-lib-libXxf86misc-devel -BuildRequires: xorg-lib-libxkbfile-devel -Requires(post,postun): desktop-file-utils -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,postun): shared-mime-info -Requires(post,preun): GConf2 -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: desktop-file-utils -Requires: gnome-vfs2 >= 2.18.1 -Requires: gstreamer-audio-effects-base >= 0.10.10 -Obsoletes: acme -Obsoletes: fontilus -Obsoletes: gnome -Obsoletes: themus -# sr@Latn vs. sr@latin -Conflicts: glibc-misc < 6:2.7 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%description -A Configuration tool for easily setting up your GNOME environment. - -%description -l es.UTF-8 -El control-center es una herramienta para una configuración facilitada -el entorno GNOME. - -%description -l pl.UTF-8 -Narzędzie do łatwej konfiguracji środowiska GNOME. - -%description -l pt_BR.UTF-8 -O Control Center é uma ferramenta para facilmente configurar seu -ambiente GNOME. - -%description -l ru.UTF-8 -Пакет Control Center содержит утилиты, позволяющие настраивать среду -GNOME вашей системы (такие вещи как фон рабочего стола и темы, -программа сохранения экрана, оконный менеджер, системные звуки, -поведение мыши и др.) - -Этот пакет нужен, если вы устанавливаете среду GNOME. - -%description -l uk.UTF-8 -Пакет Control Center містить утиліти, які дозволяють настроювати -середовище GNOME вашої системи (такі речі як фон робочого столу та -теми, програма збереження екрану, віконний менеджер, системні звуки, -поведінка миші та ін.) - -Цей пакет потрібний, якщо ви встановлюєте середовище GNOME. - -%package libs -Summary: GNOME Control Center gnome-window-settings library -Summary(pl.UTF-8): Biblioteka Control Center gnome-window-settings -Group: Development/Libraries -Requires: libgnomeui >= 2.18.1 - -%description libs -This package contains gnome-window-settings library. - -%description libs -l pl.UTF-8 -Pakiet ten zawiera bibliotekę gnome-window-settings. - -%package devel -Summary: GNOME Control Center header files -Summary(pl.UTF-8): Pliki nagłówkowe bibliotek GNOME Control Center -Group: X11/Development/Libraries -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: dbus-glib-devel >= 0.73 -Requires: fam-devel -Requires: gnome-desktop-devel >= 2.18.0 -Requires: gnome-menus-devel >= 2.18.0 -Requires: gtk+2-devel >= 2:2.10.10 -Requires: libgnomeui-devel >= 2.18.1 -Requires: librsvg-devel >= 2.16.1 - -%description devel -GNOME Control-Center header files. - -%description devel -l pl.UTF-8 -Pliki nagłówkowe bibliotek GNOME Control Center. - -%package static -Summary: GNOME Control Center static libraries -Summary(pl.UTF-8): Statyczne biblioteki GNOME Control Center -Group: X11/Development/Libraries -Requires: %{name}-devel = %{epoch}:%{version}-%{release} - -%description static -GNOME Control Center static libraries. - -%description static -l pl.UTF-8 -Statyczne biblioteki GNOME Control Center. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -%build -%{__gnome_doc_prepare} -%{__gnome_doc_common} -%{__glib_gettextize} -%{__intltoolize} -%{__libtoolize} -%{__aclocal} -%{__autoheader} -%{__autoconf} -%{__automake} -%configure \ - --disable-schemas-install \ - --disable-update-mimedb \ - --enable-gstreamer=0.10 \ - --enable-aboutme \ - X_EXTRA_LIBS="-lXext" -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -# no static modules - shut up check-files -rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions*/*.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{a,la} - -[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \ - mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin} -%find_lang %{name} --with-gnome --all-name - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%gconf_schema_install apps_gnome_settings_daemon_default_editor.schemas -%gconf_schema_install apps_gnome_settings_daemon_keybindings.schemas -%gconf_schema_install apps_gnome_settings_daemon_screensaver.schemas -%gconf_schema_install control-center.schemas -%gconf_schema_install desktop_gnome_font_rendering.schemas -%gconf_schema_install fontilus.schemas -%gconf_schema_install themus.schemas -%scrollkeeper_update_post -%update_mime_database -%update_desktop_database_post -%update_icon_cache hicolor - -%preun -%gconf_schema_uninstall apps_gnome_settings_daemon_default_editor.schemas -%gconf_schema_uninstall apps_gnome_settings_daemon_keybindings.schemas -%gconf_schema_uninstall apps_gnome_settings_daemon_screensaver.schemas -%gconf_schema_uninstall control-center.schemas -%gconf_schema_uninstall desktop_gnome_font_rendering.schemas -%gconf_schema_uninstall fontilus.schemas -%gconf_schema_uninstall themus.schemas - -%postun -%scrollkeeper_update_postun -%update_mime_database -%update_desktop_database_postun -%update_icon_cache hicolor - -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - -%files -f %{name}.lang -%defattr(644,root,root,755) -%doc AUTHORS ChangeLog MAINTAINERS NEWS README -%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas -%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas -%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas -%{_sysconfdir}/gconf/schemas/control-center.schemas -%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas -%{_sysconfdir}/gconf/schemas/fontilus.schemas -%{_sysconfdir}/gconf/schemas/themus.schemas -%{_sysconfdir}/gnome-vfs-2.0/modules/* -%{_sysconfdir}/xdg/menus/gnomecc.menu -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/gnome-settings-daemon -%attr(755,root,root) %{_libdir}/nautilus/extensions*/*.so -%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so -%attr(755,root,root) %{_libdir}/window-manager-settings/*.so -%dir %{_libdir}/window-manager-settings -%{_datadir}/control-center -%{_datadir}/dbus-1/services/*.service -%{_datadir}/desktop-directories/*.directory -%{_datadir}/gnome/cursor-fonts -%{_datadir}/mime/packages/gnome-theme-package.xml -%{_iconsdir}/hicolor/*/*/typing-monitor.* -%{_omf_dest_dir}/control-center -%{_pixmapsdir}/*.png -%{_desktopdir}/*.desktop - -%files libs -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgnome-window-settings.so.*.*.* - -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgnome-window-settings.so -%{_libdir}/libgnome-window-settings.la -%{_includedir}/gnome-window-settings-2.0 -%{_includedir}/gnome-settings-daemon-2.0 -%{_pkgconfigdir}/gnome-window-settings-2.0.pc -%{_pkgconfigdir}/gnome-settings-daemon.pc - -%files static -%defattr(644,root,root,755) -%{_libdir}/libgnome-window-settings.a -- 2.43.0