OBS User unknown 2009-02-06 23:00:48 +00:00 committed by Git OBS Bridge
parent 3c74ca71c3
commit eb35eadd0a
10 changed files with 123 additions and 1944 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
size 2113356

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1ed54e19bfc0170f2ef13b1691a4f98c477661d7e50c4858918c5c90a29670f
size 2134123

View File

@ -1,13 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -19,7 +19,7 @@ GNOME_DOC_INIT
m4_define(gnomevfs_minver, 2.0.0)
m4_define(fontconfig_minver, 1.0.0)
-m4_define(xft_minver, 2.1.2)
+m4_define(xft_minver, 2.0.0)
m4_define(gtk_minver, 2.11.6)
m4_define(libbonobo_minver, 2.0.0)
m4_define(libgnomeui_minver, 2.2.0)

View File

@ -1,51 +0,0 @@
Index: gnome-control-center-2.19.4/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
================================================================================
--- gnome-control-center-2.19.5/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+++ gnome-control-center-2.19.5/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Keyboard Accessibility
+_Name=Accessibility
_Comment=Set your keyboard accessibility preferences
Exec=gnome-accessibility-keyboard-properties
Icon=gnome-settings-accessibility-keyboard
--- gnome-control-center-2.19.5/capplets/default-applications/default-applications.desktop.in.in
+++ gnome-control-center-2.19.5/capplets/default-applications/default-applications.desktop.in.in
@@ -7,7 +7,7 @@
Terminal=false
Type=Application
StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;AdvancedSettings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center
--- gnome-control-center-2.19.5/capplets/keybindings/keybinding.desktop.in.in
+++ gnome-control-center-2.19.5/capplets/keybindings/keybinding.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Keyboard Shortcuts
+_Name=Shortcuts
_Comment=Assign shortcut keys to commands
Exec=gnome-keybinding-properties
Icon=gnome-settings-keybindings
--- gnome-control-center-2.19.5/capplets/network/gnome-network-preferences.desktop.in.in
+++ gnome-control-center-2.19.5/capplets/network/gnome-network-preferences.desktop.in.in
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Network Proxy
+_Name=Network Proxies
_Comment=Set your network proxy preferences
Exec=gnome-network-preferences
Icon=gnome-network-preferences
Terminal=false
Type=Application
StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;AdvancedSettings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center

View File

@ -1,12 +0,0 @@
Index: shell/gnomecc.desktop.in.in
===================================================================
--- shell/gnomecc.desktop.in.in.orig
+++ shell/gnomecc.desktop.in.in
@@ -10,6 +10,7 @@ Type=Application
StartupNotify=true
Categories=GNOME;GTK;Settings;
OnlyShowIn=GNOME;
+DocPath=control-cent
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
X-GNOME-Bugzilla-Component=shell

View File

@ -65,7 +65,7 @@ Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
===================================================================
--- /dev/null
+++ gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
@@ -0,0 +1,214 @@
@@ -0,0 +1,211 @@
+/* gnome-passwd.c: password change capplet
+ *
+ * Copyright (C) 2005 Novell Inc.
@ -92,11 +92,9 @@ Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
+# include <config.h>
+#endif
+
+#include <libgnome/libgnome.h>
+#include <unistd.h>
+#include <gconf/gconf-client.h>
+#include <glade/glade.h>
+#include <gnome.h>
+#include <libgnomevfs/gnome-vfs-uri.h>
+#include <pwd.h>
+#include <X11/XKBlib.h>
+#include <gdk/gdkx.h>
@ -268,9 +266,8 @@ Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ gnome_program_init ("gnome-passwd", VERSION,
+ LIBGNOMEUI_MODULE,
+ argc, argv, GNOME_PARAM_NONE);
+ gtk_init (&argc, &argv);
+ g_set_application_name ("gnome-passwd");
+
+ dialog = glade_xml_new (GNOMECC_DATA_DIR "/glade/gnome-passwd.glade",
+ "passwd_dialog", NULL);
@ -650,14 +647,14 @@ Index: gnome-control-center-2.19.4/capplets/passwd/pam-passwd.c
+ * 02111-1307, USA.
+ */
+
+#include <libgnome/libgnome.h>
+#include <glade/glade.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glade/glade.h>
+#include <gnome.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <unistd.h>
+#include <pwd.h>
+
@ -913,7 +910,7 @@ Index: gnome-control-center-2.19.4/capplets/passwd/pam-passwd.h
+#ifndef __PAM_PASSWD_H
+#define __PAM_PASSWD_H
+
+#include <gnome.h>
+#include <gtk/gtk.h>
+
+#define OLD_PASSWD_MSG_TITLE "old_passwd:"
+#define NEW_PASSWD_MSG_TITLE "new_passwd:"
@ -1522,14 +1519,14 @@ Index: gnome-control-center-2.19.4/configure.in
+capplets/passwd/Makefile
+capplets/passwd/pam/Makefile
+capplets/passwd/gnome-passwd.desktop.in
capplets/sound/Makefile
capplets/sound/gnome-settings-sound.desktop.in
capplets/windows/Makefile
capplets/windows/window-properties.desktop.in
font-viewer/Makefile
Index: gnome-control-center-2.19.4/po/POTFILES.in
===================================================================
--- gnome-control-center-2.19.4.orig/po/POTFILES.in
+++ gnome-control-center-2.19.4/po/POTFILES.in
@@ -62,6 +62,10 @@ capplets/mouse/gnome-settings-mouse.desk
@@ -62,5 +62,9 @@ capplets/mouse/gnome-settings-mouse.desk
capplets/network/gnome-network-preferences.c
capplets/network/gnome-network-preferences.desktop.in.in
capplets/network/gnome-network-preferences.glade
@ -1537,6 +1534,6 @@ Index: gnome-control-center-2.19.4/po/POTFILES.in
+capplets/passwd/gnome-passwd.c
+capplets/passwd/pam-passwd.c
+capplets/passwd/gnome-passwd.glade
capplets/sound/gnome-settings-sound.desktop.in.in
capplets/sound/mixer-support.c
capplets/sound/pipeline-tests.c
capplets/windows/gnome-window-properties.c
capplets/windows/gnome-window-properties.glade
capplets/windows/window-properties.desktop.in.in

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jan 23 16:25:43 CET 2009 - vuntz@novell.com
- Really apply gnome-control-center-bnc427745-force-dpi.patch
- Drop gnome-control-center-desktop.patch: the only relevant
changes to desktop files are now done via
%suse_update_desktop_file
- Drop gnome-control-center-docpath.patch: we don't use DocPath in
GNOME.
- Reduce BuildRequires.
- Remove specific commands for old version of openSUSE, including
the handling of permissions stuff that is now done another way
(so we can drop permissions.tar.bz2 too)
- Other minor tweaks to clean up the spec file.
- Call %suse_update_desktop_file on all desktop files. Part of
bnc#445728.
-------------------------------------------------------------------
Sat Jan 17 01:54:00 CET 2009 - crrodriguez@suse.de
@ -7,6 +24,11 @@ Sat Jan 17 01:54:00 CET 2009 - crrodriguez@suse.de
-------------------------------------------------------------------
Fri Jan 9 14:04:20 CST 2009 - federico@novell.com
- Remove gnome-control-center-randr-gerror.diff. Fixed upstream
-------------------------------------------------------------------
Fri Jan 9 14:04:20 CST 2009 - federico@novell.com
- Added gnome-control-center-randr-gerror.diff. This adds good error
reporting when changing the multihead configuration, and fixes these
bugs:
@ -18,6 +40,21 @@ Fri Jan 9 14:04:20 CST 2009 - federico@novell.com
bgo#551566 - Fix incorrect repainting when resizing the capplet's
dialog.
-------------------------------------------------------------------
Fri Dec 26 11:40:05 CET 2008 - rodrigo@novell.com
- Remove unneeded patch
- Update to version 2.25.3:
+ Removed sound capplet, moved to gnome-media
+ Add support for fingerprint readers with more than one enrollment stage
+ Display errors when any happen
+ Slight UI changes
+ When a monitor is selected, update the monitor label to have the monitor's
name and colour so they know which one is being edited
+ Make the monitor on which the dialogue appears the default one on startup
+ Fix monitors still overlapping when turning off "Mirror screens"
+ Remove unneeded help button in display capplet
-------------------------------------------------------------------
Wed Nov 12 19:25:07 CET 2008 - rodrigo@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-control-center (Version 2.24.0.1)
# spec file for package gnome-control-center (Version 2.25.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,55 +19,53 @@
Name: gnome-control-center
%define _name control-center
BuildRequires: desktop-file-utils docbook-xsl-stylesheets eel-devel
BuildRequires: evolution-data-server-devel fdupes gnome-common
BuildRequires: gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel
BuildRequires: gnome-panel-devel gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel gstreamer010-plugins-base-devel
BuildRequires: intltool libcanberra-devel libcanberra-gtk libglade2-devel
BuildRequires: libgnomekbd-devel libidl librsvg-devel libxklavier-devel
BuildRequires: metacity-devel nautilus-devel pam-devel perl-XML-Parser
BuildRequires: scrollkeeper sgml-skel update-desktop-files xorg-x11
BuildRequires: desktop-file-utils
BuildRequires: evolution-data-server-devel
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-menus-devel
BuildRequires: gnome-panel-devel
BuildRequires: gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel
BuildRequires: gstreamer010-plugins-base-devel
BuildRequires: intltool
BuildRequires: libglade2-devel
BuildRequires: libgnomekbd-devel
BuildRequires: librsvg-devel
BuildRequires: libxklavier-devel
BuildRequires: metacity-devel
BuildRequires: pam-devel
BuildRequires: scrollkeeper
BuildRequires: update-desktop-files
BuildRequires: xorg-x11
License: GPL v2 or later
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.24.0.1
Release: 7
Version: 2.25.3
Release: 1
Summary: The GNOME Control Center
Source: gnome-%{_name}-%{version}.tar.bz2
Source: %{name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
Source2: fontilus.xml
Source3: change-password.png
Source4: permissions.tar.bz2
# PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
Patch1: gnome-control-center-bnc427745-force-dpi.patch
# PATCH-NEEDS-REBASE gnome-control-center-desktop.patch
Patch3: gnome-control-center-desktop.patch
# PATCH-FIX-OPENSUSE gnome-control-center-backout-309558.patch bgo309558
Patch6: gnome-control-center-backout-309558.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-passwd-dialog.patch
Patch8: gnome-control-center-passwd-dialog.patch
# PATCH-FIX-OPENSUSE gnome-control-center-docpath.patch
Patch13: gnome-control-center-docpath.patch
# PATCH-FIX-UPSTREAM gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration
Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-use-settings-menu.patch
Patch28: gnome-control-center-use-settings-menu.patch
# PATCH-FIX-OPENSUSE gnome-control-center-bnc373197-layout-switch-keybinding.patch bnc373197 vuntz@novell.com -- this is a temporary hack to change the default layout switching keybinding
Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch
# PATCH-FIX-UPSTREAM gnome-control-center-randr-gerror.diff bnc381030 bnc450141 bnc433939 bgo551566 - Various usability fixes for the display capplet
Patch31: gnome-control-center-randr-gerror.diff
Url: http://www.gnome.org
Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk
Requires: %{name}-lang = %{version}
PreReq: permissions
%if %suse_version > 1000
Recommends: gnome-audio
%else
Requires: gnome-audio
%endif
Provides: control-center2 = 2.22.1
Obsoletes: control-center2 <= 2.22.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -88,13 +86,8 @@ License: GPL v2 or later
Summary: Header files for the GNOME Control Center
Group: System/GUI/GNOME
AutoReqProv: on
#FIXME: carefully review this dependencies
Requires: %{name} = %{version} dbus-1-devel glib2-devel gtk2-devel libgnomeui-devel gnome-desktop-devel gnome-menus-devel gnome-panel-devel libglade2-devel librsvg-devel pango-devel
%if %suse_version > 1010
Requires: %{name} = %{version} dbus-1-devel glib2-devel gtk2-devel gnome-desktop-devel gnome-menus-devel libglade2-devel librsvg-devel pango-devel
Requires: dbus-1-glib-devel
%else
Requires: dbus-1-devel dbus-1-glib
%endif
Provides: control-center2-devel = 2.22.1
Obsoletes: control-center2-devel <= 2.22.1
@ -109,17 +102,14 @@ Authors:
%lang_package
%prep
%setup -q -n gnome-%{_name}-%{version} -a 1 -b 4
%setup -q -n %{name}-%{version} -a 1
gnome-patch-translation-prepare
#%patch3 -p1
%patch6
%patch1 -p1
%patch8 -p1
%patch13
%patch14 -p1
#%patch14 -p1
cp %{S:3} capplets/passwd/change-password.png
%patch28
%patch30 -p1
%patch31 -p1
gnome-patch-translation-update
%build
@ -144,28 +134,21 @@ cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
# capplets
%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
### % # suse $ _update_desktop_file background X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications X-SuSE-ControlCenter-System
%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications X-SuSE-ControlCenter-System DesktopSettings AdvancedSettings
%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware
### % # suse $ _update_desktop_file font-properties X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-passwd X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-settings-sound X-SuSE-ControlCenter-System
%suse_update_desktop_file gnome-network-preferences X-SuSE-ControlCenter-System
%suse_update_desktop_file gnome-network-preferences X-SuSE-ControlCenter-System AdvancedSettings
%suse_update_desktop_file gnome-appearance-properties X-SuSE-ControlCenter-LookAndFeel
### % # suse $ _update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties X-SuSE-ControlCenter-LookAndFeel
### % # suse $ _update_desktop_file gtk-theme-selector X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal
%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-at-session
%suse_update_desktop_file gnome-font-viewer
%suse_update_desktop_file gnome-theme-installer
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
#mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/display-capplet.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
cp control-center-art/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
%if %suse_version <= 1020
mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
cp -a ../permissions/* $RPM_BUILD_ROOT/etc/permissions.d
%endif
%find_lang gnome-%{_name}-2.0
%find_lang %{name}-2.0
%find_gconf_schemas
cat %{name}.schemas_list >gnome-%{name}.lst
find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
@ -202,50 +185,47 @@ fi
%{_datadir}/applications/*.desktop
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
%dir %{_datadir}/gnome/help/control-center
%dir %{_datadir}/gnome/help/control-center/*
%{_datadir}/gnome/help/control-center/*/*.xml
%dir %{_datadir}/gnome-control-center/default-apps
%{_datadir}/gnome-control-center/default-apps/gnome-default-applications.xml
%{_datadir}/gnome-control-center
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%dir %{_datadir}/gnome-control-center/keybindings
%{_datadir}/gnome-control-center/keybindings/*.xml
%{_datadir}/mime/packages/*.xml
%{_datadir}/omf/control-center
%dir %{_datadir}/gnome-control-center
%dir %{_datadir}/gnome-control-center/glade
%{_datadir}/gnome-control-center/glade/*.glade
%dir %{_datadir}/gnome-control-center/pixmaps
%{_datadir}/gnome-control-center/pixmaps/*.png
%doc %{_datadir}/gnome/help/control-center
%doc %{_datadir}/omf/control-center
%{_libdir}/*.so.*
#%{_libdir}/gnome-vfs-2.0/modules/*.so
#%{_libdir}/nautilus/extensions-2.0/*.so
%dir %{_libdir}/window-manager-settings
%{_libdir}/window-manager-settings/*.so
%{_libdir}/window-manager-settings
%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd
#%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
%{_sysconfdir}/xdg/menus/gnomecc.menu
%{_sysconfdir}/pam.d/gnome-passwd
%if %suse_version <= 1020
/etc/permissions.d/*
%endif
%files lang -f gnome-%{_name}-2.0.lang
%files lang -f %{name}-2.0.lang
%files devel
%defattr (-, root, root)
# %{_datadir}/idl/*.idl
%{_includedir}/gnome-window-settings-2.0
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/pkgconfig/*.pc
%changelog
* Fri Jan 23 2009 vuntz@novell.com
- Really apply gnome-control-center-bnc427745-force-dpi.patch
- Drop gnome-control-center-desktop.patch: the only relevant
changes to desktop files are now done via
%%suse_update_desktop_file
- Drop gnome-control-center-docpath.patch: we don't use DocPath in
GNOME.
- Reduce BuildRequires.
- Remove specific commands for old version of openSUSE, including
the handling of permissions stuff that is now done another way
(so we can drop permissions.tar.bz2 too)
- Other minor tweaks to clean up the spec file.
- Call %%suse_update_desktop_file on all desktop files. Part of
bnc#445728.
* Sat Jan 17 2009 crrodriguez@suse.de
- remove "la" files, baby step to clean up all references
to libavahi-*.la
* Fri Jan 09 2009 federico@novell.com
- Remove gnome-control-center-randr-gerror.diff. Fixed upstream
- Added gnome-control-center-randr-gerror.diff. This adds good error
reporting when changing the multihead configuration, and fixes these
bugs:
@ -256,6 +236,18 @@ fi
monitor that is off.
bgo#551566 - Fix incorrect repainting when resizing the capplet's
dialog.
* Fri Dec 26 2008 rodrigo@novell.com
- Remove unneeded patch
- Update to version 2.25.3:
+ Removed sound capplet, moved to gnome-media
+ Add support for fingerprint readers with more than one enrollment stage
+ Display errors when any happen
+ Slight UI changes
+ When a monitor is selected, update the monitor label to have the monitor's
name and colour so they know which one is being edited
+ Make the monitor on which the dialogue appears the default one on startup
+ Fix monitors still overlapping when turning off "Mirror screens"
+ Remove unneeded help button in display capplet
* Wed Nov 12 2008 rodrigo@novell.com
- Add libcanberra-gtk to Requires to get sound events working (bnc#439054)
* Tue Nov 04 2008 vuntz@novell.com

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:784221e2fc6a351cdfb7a24f299fdcef529e3aa31e72ee3994f817e530f708df
size 285