1
0

Accepting request 67381 from GNOME:Next

thanks

OBS-URL: https://build.opensuse.org/request/show/67381
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=93
This commit is contained in:
Vincent Untz 2011-04-25 09:58:59 +00:00 committed by Git OBS Bridge
parent ef70868d59
commit fd6ab4bdcf
9 changed files with 485 additions and 1788 deletions

View File

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

View File

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

View File

@ -1,16 +0,0 @@
Index: gnome-control-center-2.24.0/capplets/appearance/appearance-font.c
===================================================================
--- gnome-control-center-2.24.0.orig/capplets/appearance/appearance-font.c
+++ gnome-control-center-2.24.0/capplets/appearance/appearance-font.c
@@ -759,8 +759,10 @@ dpi_load (GConfClient *client,
if (value) {
dpi = gconf_value_get_float (value);
gconf_value_free (value);
- } else
+ } else {
dpi = get_dpi_from_x_server ();
+ dpi = DPI_FALLBACK;
+ }
if (dpi < DPI_LOW_REASONABLE_VALUE)
dpi = DPI_LOW_REASONABLE_VALUE;

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +0,0 @@
Index: gnome-control-center-2.27.91/shell/control-center.c
===================================================================
--- gnome-control-center-2.27.91.orig/shell/control-center.c
+++ gnome-control-center-2.27.91/shell/control-center.c
@@ -35,6 +35,14 @@ static GSList *get_actions_list ();
#define CONTROL_CENTER_ACTIONS_SEPARATOR ";"
#define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action"
+#define COMMON_TASK_1 N_("Change Look and Feel")
+#define COMMON_TASK_2 N_("Set Preferred Applications")
+#define COMMON_TASK_3 N_("Configure Printer")
+#define COMMON_TASK_4 N_("Configure Network")
+#define COMMON_TASK_5 N_("Edit Personal Information")
+#define COMMON_TASK_6 N_("Add User")
+#define COMMON_TASK_7 N_("Open Administrator Settings")
+
static GSList *
get_actions_list (void)
{
@@ -57,7 +65,7 @@ get_actions_list (void)
action = g_new (AppAction, 1);
temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2);
- action->name = g_strdup (temp[0]);
+ action->name = g_strdup (_(temp[0]));
if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL)
{
g_warning ("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]);

View File

@ -1,115 +0,0 @@
Index: gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c
===================================================================
--- gnome-control-center-2.32.1.orig/capplets/appearance/appearance-desktop.c
+++ gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c
@@ -48,6 +48,50 @@ static const GtkTargetEntry drag_types[]
static void wp_update_preview (GtkFileChooser *chooser, AppearanceData *data);
+static GnomeWPItem *
+lookup_with_symlink (AppearanceData *data,
+ const char *path,
+ char **real_path)
+{
+ GnomeWPItem *item;
+ gchar *readlink;
+
+ if (real_path)
+ *real_path = NULL;
+
+ if (!path)
+ return NULL;
+
+ item = g_hash_table_lookup (data->wp_hash, path);
+ if (item)
+ return item;
+
+ /* if the current background is not in the hash of known backgrounds,
+ * see if it's a symlink and if the file it points to is in the hash */
+
+ readlink = g_strdup (path);
+
+ while (readlink &&
+ g_file_test (readlink, G_FILE_TEST_IS_SYMLINK) &&
+ item == NULL) {
+ gchar *new;
+
+ new = g_file_read_link (readlink, NULL);
+ g_free (readlink);
+ readlink = new;
+
+ if (readlink)
+ item = g_hash_table_lookup (data->wp_hash, readlink);
+ }
+
+ if (item != NULL && real_path)
+ *real_path = readlink;
+ else
+ g_free (readlink);
+
+ return item;
+}
+
static void
select_item (AppearanceData *data,
GnomeWPItem * item,
@@ -418,11 +462,16 @@ wp_uri_changed (const gchar *uri,
AppearanceData *data)
{
GnomeWPItem *item, *selected;
+ gchar *realuri;
+
+ realuri = NULL;
+ item = lookup_with_symlink (data, uri, &realuri);
+ if (!realuri)
+ realuri = g_strdup (uri);
- item = g_hash_table_lookup (data->wp_hash, uri);
selected = get_selected_item (data, NULL);
- if (selected != NULL && strcmp (selected->filename, uri) != 0)
+ if (selected != NULL && strcmp (selected->filename, realuri) != 0)
{
if (item == NULL)
item = wp_add_image (data, uri);
@@ -430,6 +479,8 @@ wp_uri_changed (const gchar *uri,
if (item)
select_item (data, item, TRUE);
}
+
+ g_free (realuri);
}
static void
@@ -936,6 +987,7 @@ wp_load_stuffs (void *user_data)
AppearanceData *data;
gchar *imagepath, *uri, *style;
GnomeWPItem *item;
+ gchar *realpath;
data = (AppearanceData *) user_data;
@@ -971,7 +1023,12 @@ wp_load_stuffs (void *user_data)
g_free (uri);
- item = g_hash_table_lookup (data->wp_hash, imagepath);
+ realpath = NULL;
+ item = lookup_with_symlink (data, imagepath, &realpath);
+ if (realpath) {
+ g_free (imagepath);
+ imagepath = realpath;
+ }
if (item != NULL)
{
@@ -986,7 +1043,9 @@ wp_load_stuffs (void *user_data)
wp_props_load_wallpaper (item->filename, item, data);
}
+ data->wp_update_gconf = FALSE;
select_item (data, item, FALSE);
+ data->wp_update_gconf = TRUE;
}
}
else if (strcmp (style, "none") != 0)

View File

@ -1,13 +0,0 @@
Index: shell/control-center.c
===================================================================
--- shell/control-center.c.orig
+++ shell/control-center.c
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
return retval;
}
- app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
+ app_data = appshelldata_new ("settings.menu", NULL, CONTROL_CENTER_PREFIX,
GTK_ICON_SIZE_DND, FALSE, TRUE);
generate_categories (app_data);

View File

@ -1,3 +1,400 @@
-------------------------------------------------------------------
Wed Apr 6 14:23:52 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0.1:
+ Network:
- Avoid assertions with mobile broadband devices
+ Background:
- Fix a compiler warning
+ Printers:
- Actualize printer and job lists automatically
- Avoid crash if policy is unavailable
- Don't set a reason when setting AcceptJobs
+ Date & Time:
- Fix test-endianess on OpenSUSE (bgo#646780)
- Changes from version 3.0.0:
+ Background:
- Don't show errors when loading default bg (bgo#646056).
- Don't use the GnomeBG thumbnails for the preview area
(bgo#646180).
- Don't assert() for typos in XML files (bgo#646250).
+ Common:
- Remove API reference, as it's incomplete and going away for
next cycle.
- Fix build on fresh checkouts
+ Keyboard:
- Set repeat-interval correctly (bgo#646241)
- Bump gnome-settings-daemon requirement
+ Network:
- Use symbolic icon for ad-hoc wireless connections
(bgo#646140).
- Hide the security cell renderer if there's no icon to display
(bgo#646140)
- Do not add bluetooth devices to the panel to avoid asserting
the control-center.
- Fix build against NetworkManager on Debian (bgo#646349).
- Reset the network name combo when disconnected (bgo#646031).
- Display more detailed status for unavailable devices
(bgo#646027).
- Make creating vpn connections work again.
+ Printers:
- Make "Print Test Page" button always sensitive
- Do not delete browsed printers
+ Region:
- Make the layout options modal (bgo#646183).
+ Shell:
- Turn off spinner cursor when launched (bgo#646045).
+ Sound:
- Make the volume icons smaller and center them properly in the
bar (bgo#646153).
- Make sound applet work again in fallback (bgo#646044).
+ Universal Access:
- Don't incorrectly mark some hboxes as insensitive
(bgo#646240).
- Drop fix-timezone-build.patch: fixed upstream
- Ensure suse_update_desktop_files is called on all .desktop files.
-------------------------------------------------------------------
Wed Mar 30 08:18:22 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.93:
+ Common:
- Add a --verbose option to the shell
- Make sure the desktop file uses categories that show up in
menus.
+ Date & Time:
- Fix time widget ordering in RTL locales
+ Printing:
- Use a single privilege to unlock the entire page
- Honor disable-print-setup lockdown setting
- Use CUPS printer test page
+ Power:
- Use a better icon
+ Sound:
- Port to GSettings
- Fallback if loading a non-existent custom theme
+ User Accounts:
- Remove stray debugging output
- Make crop window modal
- Fix crop window background color
+ Universal Access:
- Bring screen reader option back
+ Network:
- Drop creation of custom connections for now, except for VPN
- Show a padlock icon for 'secure' access points
+ Memory leak fixes
- Implement on/off switch for wired devices
- Properly track VPN connection state
- Use grids for better UI alignment
- Handle NetworkManager restarts gracefully
+ Region:
- Remove tooltips from layout list
+ Background:
- Make the window fit on small screens
+ Updated translations.
-------------------------------------------------------------------
Thu Mar 24 14:29:01 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.92:
+ Common:
- Bump GTK+ dep to 3.0.2 (bgo#644182)
- Fix linking of libshortcuts against (bgo#644410)
- Improve CUPS detection (bgo#644064)
- Set the 'inline-toolbar' style class to toolbars which need
it (bgo#645059)
+ Background:
- Use new picture-uri GSettings key (bgo#633983)
+ Date and Time:
- Change combobox when map is clicked
- Make 24h setting changeable without unlocking (bgo#643891)
- Add missing timezone files (bgo#630261)
- Add hacks to support more timezones
- Don't crash when the timezone is unknown
+ Display:
- Fix dragging rotated monitors (bgo#641345)
+ Info:
- Use dim labels
+ Keyboard:
- Fix crasher when num workspace changes (bgo#644784)
- Mark the scales as insensitive when the checkboxes are off
(bgo#645151)
- Correct labels for blinking speed (bgo#645314)
+ Mouse:
- Don't destroy the touchpad tab
- Check caps of the touchpad when added
- Make sure we fit within our minimum vertical size
- Don't reset scrolling method on start (bgo#642474)
+ Network:
- Show the wireless security currently being used
- Do not show a provider string for mobile broadband devices
when not connected.
- Do not show the IPv6 address if nm_device_get_dhcp6_config()
failed.
- nm_device_wifi_get_bitrate() returns values in kb/s, not
Mb/s.
- Hide UI controls that are not connected up to anything yet.
- Display the IPv6 address if one is provided for the device.
- Never show the loop device if IP4 data isn't available.
- Use an abstract device so we can get the VPN connection data/
- Show the VPN connection state in the panel header.
- A disconnected wired connection is 'Unplugged', not
'Disconnected'.
- Display a different icon if the wired ethernet device is
disconnected.
- Do not show a speed of zero for any device
- Ensure we refresh the UI if coldplug devices are changed
- Add Option buttons
- Fix some alignment and focus issues
- Add a device off switch
- Implement and show on/off switch for wireless/wimax
- Refresh UI when active connections change
- Add Option buttons to allow editing connections
- Watch for new VPN connections being added and add them to the
panel.
- Drop tooltips on the device list (bgo#644964)
- Use dim-label style class for labels (bgo#644964)
- Fix version compatibility warning dialog (bgo#644973)
- Avoid header pixel noise and inconsistent spacing
(bgo#644954, bgo#644955)
+ Printers:
- Attach 'add printer' dialog to toplevel (bgo#644213)
- Call cupsGetDevices() asynchronously (bgo#644212)
- Use dim-label to accentuate values
- Set longer timeout for installation of printer driver
- Don't sort printers by usage
- Handle no printers situation better (bgo#641421)
- Show IP address of printer
- Change text about unavailability of CUPS (bgo#641421)
- Fix alignment in secondary notebook pages
- Show computer-fail icon when can not connect to CUPS (bgo#641421)
+ Region:
- Using separate window group to avoid modal shadowing
- Stop layout add dialogue from "jumping"
- Make drag'n'drop work
+ Screen:
- Fix the delay acrobatics (bgo#644403)
- Drop converting between seconds and minutes
- Set the label as insensitive when Lock is off (bgo#645149)
- Honor disable-lock-screen setting
+ Shell:
- Fix resizing when switching from panel to panel (bgo#636596)
+ Sound:
- Fix scroll event handling of channel bars (bgo#644462)
- Fix ordering of typedefs
- Use upstream value for amplified volume (bgo#644292)
- Add introspection info for new GIcon function
- Remove old support code for PA < 0.9.15
+ Universal access:
- Set the name to the right hboxes (bgo#645135)
- Use NO_SENSITIVITY flag for g_settings_bind() (bgo#645171)
+ User accounts:
- Use dim-label class instead of hardcoded color
- Update cheeese minimum requirements
- Nuke supervised accounts
- Don't warn if there are no faces pixmaps (bgo#645347)
- Changes from version 2.91.91:
+ Shell:
- Reload the list of panels when new ones are added
+ Date and Time:
- Use correct order for date widgets when in non-US locales
+ Info:
- Look for which device is being driven by the VESA driver
- Remove (tm) from GNOME logo
+ Keyboard:
- Add support for the magnifier zoom in/out shortcuts
- Fix loading of custom shortcuts
- Fix initial selection in the shortcut pane
- Make shortcut conflicts code actually work
- Fix warning about "editing-canceled"
- Make repeat rate and speed follow a11y guidelines
+ Network:
- Update for recent NetworkManager changes
+ Printers:
- Don't show driver version in the model name
- Add dialogue for adding new printers
+ Region and Language:
- Don't block the interface when loading the panel
- Do not allow adding the same keyboard layout twice
+ Sound:
- Fix only starting applet in fallback session
+ Universal Access:
- Show actual keyboard shortcuts as defined in Keyboard
- Make "on-screen keyboard" switch work
- Fix initial state of typing help
- Add "smaller text" size
- Add fix-timezone-build.patch: fix locale path, used at build time
to check if timezone data are available.
- Add build requires on pkgconfig(cheese-gtk): allow to take user
face snapshot from user account dialog.
- Add requires on freeglut, system info panel needs glxinfo binary.
-------------------------------------------------------------------
Wed Mar 2 10:55:51 CET 2011 - vuntz@opensuse.org
- Remove gnome-patch-translation support as there are no strings
added by patches anymore:
+ remove gnome-patch-translation BuildRequires.
+ remove calls to gnome-patch-translation-prepare/update in
%setup.
-------------------------------------------------------------------
Thu Feb 24 14:41:37 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.90:
+ Background:
- Remove loading of obsolete backgrounds
- Load initial state from GSettings
- Don't warn when trying to load a gradient
- Make loading wallpapers seem faster
- Show 'Adwaita' as the first in the list (bgo#637384)
- Handle no-flags from saved config
- Set the shading for pictures
- Add/Remove features for panel
- Don't show an error if no cache dir
- Add arrows for the gradients
+ Date & Time:
- Don't crash when g-s-d is badly installed (bgo#641232)
- Create filenames locale-independently (bgo#641294)
- Fix crash when TZ is an alias (bgo#641360)
- Fix city combobox filtering
+ Display:
- Remove support for old D-Bus interface
- Simplify some old GNOME 2.x code
+ Info:
- Make labels selectable
- Add graphics info
- Add special case for Atom(TM)
- Add panel chooser, graphics tab (bgo#642068)
- Add stub for default apps page
- Clarify language in force fallback controls
- Correctly detect the fallback session
+ Keyboard:
- Change grouping of keys
- Improve the layout of the bindings page
- Clean up GConf handling
- Add support for GSettings shortcuts
- Pass a gettext package when loading GConf
- Don't resize the shell horizontally
- Don't expand tables vertically
- Add Universal Access shortcuts (bgo#641279)
+ Network:
- Wrap long dns lines
- Select the first device after they are all loaded
- Use the same border width as other panels
- Use emblem-default-symbolic for the default printer
- Disable NetworkManager when the airplane switch gets changed
- Show the wired network subnet mask
- Fix a crasher due to an uninitialized GVariant
- Fix linking
- Port to the rm-userset branch of NetworkManager
- Only add the strongest AP for each SSID to the drop down box
+ Printers:
- Right align the image
- Use a 64px icon
- Don't expand switch vertically
- Fix panel width
- Allow location and model to span cols again
- Add unlock button (bgo#640733)
- Sort printers by usage (bgo#641285)
- l10n fixes for jobs count
- Add translation context to statuses (bgo#641339)
- Avoid unnecessary use of markup
- Check that cups is recent enough
- Change widget showing supply levels
- Don't show printers separator when not needed
- Don't try to draw empty ink level
- Replace "Idle" state by "Ready"
- Set Options and Show buttons sensitive
+ Region:
- Use consistent border spacing
- New search-based layout addition (bgo#640772)
- Minor UI tweaks in kbd layout chooser
- Remove annoying tooltip on a treeview
- Easier to understand layout switching options (bgo#641021)
- Remove code to handle print button
- Some UI fixes for the layout chooser
- Make layout filtering much faster
- Fix overeager string splitting
- Fix the modality of the Preview dialog
+ Screen:
- Simplify GtkBuilder-using code
- Hide the brightness slider when it cannot be set
- Hook up screen locking (bgo#637939)
- Set idle-delay to the same value as DPMS timeout
- Make sure the combo box is always set
- Fix the operation of locking
+ Shell:
- Add shortcuts to focus search entry (bgo#409230)
- Don't pass invalid option flags (bgo#641290)
- Use symbolic icons in the search entry (bgo#642167)
- Sort the icons alphabetically
- Make sure the search entry doesn't appear when in a panel
- Fix searching for anything hiding widgets
+ Sound:
- Try using symbolic icons for range widgets (bgo#614213)
+ Universal Access:
- Allow the pointer page to use less horizontal space
- Hide options that are currently unavailable (bgo#639784)
- Implement the zoom setting
- Adjust for magnifier schema changes
- Use switches instead of radio groups
- Show the typing assistant widgets
+ User Accounts:
- Use 0 instead of blank to clear options
- Port to GtkStyleContext
- Hide fingerprint dialogue by default (bgo#641990)
+ Updated translations
-------------------------------------------------------------------
Thu Feb 22 16:46:29 UTC 2011 - fcrozat@novell.com
- Changes from version 2.91.6:
+ Way too many changes since 2.32 to list here. Please see NEWS
the full list. Here are the highlights:
+ Port to GTK+ 3 and migrate to GSettings.
+ New control center shell, with panels, instead of independant
capplets.
+ Revamp most panels, with a streamlined UI.
+ Add new panels: Background, Date & Time, Media (based on what
was in nautilus preferences), Network (replacing proxy
capplet), Power, Printers, Sound, System Information, User
Accounts.
+ Rename Keyboard capplet to Region panel, and add language
selection there.
+ Rename Keybinding capplet to Keyboard panel.
+ Drop default applications capplet.
+ Add various nice features here and there (support backgrounds
from Flickr, make it possible to configure the use of NTP,
etc.)
- Add cups-devel BuildRequires.
- Change pkgconfig() BuildRequires:
+ add gdk-pixbuf-2.0, gsettings-desktop-schemas, iso-codes,
libsocialweb-client, polkit-gobject-1, gstreamer-0.10,
libgtop-2.0, libpulse, libpulse-mainloop-glib, upower-glib.
+ change gnome-desktop-2.0 to gnome-desktop-3.0, gtk+-2.0 to
gtk+-3.0, libcanberra-gtk to libcanberra-gtk3
+ remove libebook-1.2, libmetacity-private, libslab, unique-1.0.
- Add iso-codes Requires.
- Add apg Recommends, needed for user accounts panel.
- Drop gnome-control-center-shell-common-tasks-i18n.patch and
gnome-control-center-use-settings-menu.patch: they were only
needed for the slab-based shell, which is gone.
- Drop gnome-control-center-bnc427745-force-dpi.patch: this was
needed to change font settings, but it's gone.
- Drop gnome-control-center-mime-scheme-handler.patch: defining
default apps is now handled differently.
- Use %glib2_gsettings_schema_* macros.
- Drop libgnome-window-settings1 and libgnome-window-settings-devel
subpackages, and instead add libgnome-control-center1. Add a
Requires for it to gnome-control-center-devel.
- Pass --with-libsocialweb to configure because we want to use
libsocialweb, and remove now non-existing --enable-aboutme
option.
- Add support for source service checkout, with %BUILD_FROM_VCS:
+ Add call to ./autogen.sh.
+ Do not call %suse_update_desktop_file in this case.
-------------------------------------------------------------------
Mon Feb 21 13:53:37 CET 2011 - vuntz@opensuse.org

View File

@ -19,31 +19,39 @@
Name: gnome-control-center
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-patch-translation
BuildRequires: intltool
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(cheese-gtk)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-desktop-2.0)
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gnome-settings-daemon)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libcanberra-gtk)
BuildRequires: pkgconfig(libebook-1.2)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnomekbd)
BuildRequires: pkgconfig(libgnomekbdui)
BuildRequires: pkgconfig(libgnome-menu)
BuildRequires: pkgconfig(libmetacity-private)
BuildRequires: pkgconfig(libslab)
BuildRequires: pkgconfig(libnm-glib) >= 0.8.992
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(libsocialweb-client)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xft)
BuildRequires: pkgconfig(xi)
@ -51,39 +59,46 @@ License: GPLv2+
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.32.1
Release: 9
Version: 3.0.0.1
Release: 1
Summary: The GNOME Control Center
Source: %{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-control-center-shell-common-tasks-i18n.patch vuntz@opensuse.org -- Translate favorite capplets in the code. This is needed for our gconf2-branding to really work for this setting, so keep in sync with gconf2-branding.
Patch0: gnome-control-center-shell-common-tasks-i18n.patch
# 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-FIX-UPSTREAM gnome-control-center-mime-scheme-handler.patch vuntz@opensuse.org -- Use x-scheme-handler/* mime types to set default web browser and mailer. Cherry-picked to gonme-2-32 branch from master/3.0 branch
Patch2: gnome-control-center-mime-scheme-handler.patch
# PATCH-FIX-OPENSUSE gnome-control-center-symlinked-background.patch vuntz@opensuse.org -- Do not show twice the configured background, if it is a symlink to a known background. This only applies to 2.32.x, and is not needed on 3.0, so there's no need to send it upstream
Patch3: gnome-control-center-symlinked-background.patch
# 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 (was PATCH-FEATURE-OPENSUSE)
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
Url: http://www.gnome.org
Requires: nautilus gnome-settings-daemon gnome-menus
Requires: gnome-menus
Requires: gnome-settings-daemon
Requires: iso-codes
Requires: nautilus
# needed for /usr/bin/glxinfo, used by System info panel
Requires: freeglut
Recommends: %{name}-lang
Recommends: apg
Provides: control-center2 = 2.22.1
Obsoletes: control-center2 < 2.22.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%gconf_schemas_prereq
%description
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package -n libgnome-control-center1
License: GPLv2+
Summary: Shared library used by GNOME control center
Group: System/GUI/GNOME
%description -n libgnome-control-center1
Shared library used by GNOME control center
%package devel
License: GPLv2+
Summary: Header files for the GNOME Control Center
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: libgnome-control-center1 = %{version}
Provides: control-center2-devel = 2.22.1
Obsoletes: control-center2-devel < 2.22.1
@ -91,77 +106,57 @@ Obsoletes: control-center2-devel < 2.22.1
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package -n libgnome-window-settings1
License: GPLv2+
Summary: Utility library for getting window manager settings
Group: Development/Libraries/GNOME
Group: Development/Libraries/GNOME
Recommends: %{name}-lang
%description -n libgnome-window-settings1
This library is used by the GNOME control center to change preferences
of window managers.
%package -n libgnome-window-settings-devel
License: GPLv2+
Summary: Utility library for getting window manager settings - Development Files
Group: Development/Libraries/GNOME
Requires: libgnome-window-settings1 = %{version}
Requires: gtk2-devel
%description -n libgnome-window-settings-devel
This library is used by the GNOME control center to change preferences
of window managers.
%lang_package
%prep
%setup -q
translation-update-upstream
gnome-patch-translation-prepare
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
#NEEDS-REBASE
#%patch14 -p1
%patch28
gnome-patch-translation-update
%if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
%endif
%build
autoreconf -f -i
%configure --with-pic\
--disable-static\
--disable-scrollkeeper\
--disable-update-mimedb\
--enable-aboutme
make %{?jobs:-j%jobs}
--with-libsocialweb\
--disable-static\
--disable-scrollkeeper\
--disable-maintainer-mode\
--disable-update-mimedb
make %{?jobs:-j%jobs} V=1
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# Drop no: we use either nb or nn
%{__rm} %{buildroot}%{_datadir}/locale/no/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
rm -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}-2.0 %{?no_lang_C}
%find_lang %{name}-2.0-timezones %{name}-2.0.lang
# help files
%find_lang control-center %{?no_lang_C} %{name}-2.0.lang
%find_gconf_schemas
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
%suse_update_desktop_file gnome-control-center
# capplets
%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
%suse_update_desktop_file default-applications X-SuSE-ControlCenter-Personal
%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-about-me X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-network-properties X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-appearance-properties 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
%suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-info-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-display-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-network-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-mouse-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-background-panel X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-region-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-keyboard-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-datetime-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-media-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-power-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-printers-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-screen-panel X-SuSE-ControlCenter-LookAndFeel
%fdupes $RPM_BUILD_ROOT
%clean
@ -170,6 +165,7 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
%glib2_gsettings_schema_post
%desktop_database_post
%icon_theme_cache_post
%mime_database_post
@ -179,13 +175,14 @@ rm -rf $RPM_BUILD_ROOT
%preun -f %{name}.schemas_preun
%postun
%glib2_gsettings_schema_postun
%desktop_database_postun
%icon_theme_cache_postun
%mime_database_postun
%post -n libgnome-window-settings1 -p /sbin/ldconfig
%post -n libgnome-control-center1 -p /sbin/ldconfig
%postun -n libgnome-window-settings1 -p /sbin/ldconfig
%postun -n libgnome-control-center1 -p /sbin/ldconfig
%files -f %{name}.schemas_list
%defattr(-,root,root)
@ -197,36 +194,33 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/omf/
%dir %{_datadir}/omf/control-center/
%doc %{_datadir}/omf/control-center/control-center-C.omf
%{_sbindir}/gnome-display-properties-install-systemwide
%{_bindir}/*
%{_sysconfdir}/xdg/autostart/*.desktop
%{_libdir}/control-center-1/
%{_datadir}/applications/*.desktop
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
%{_datadir}/gnome-control-center
%{_datadir}/gnome-control-center/
%{_datadir}/pixmaps/faces
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/mime/packages/*.xml
%{_datadir}/polkit-1/actions/org.gnome.randr.policy
%{_datadir}/icons/hicolor/*/*/*.svg
%{_datadir}/icons/hicolor/scalable/*/*.svg
%dir %{_datadir}/sounds/gnome
%dir %{_datadir}/sounds/gnome/default
%dir %{_datadir}/sounds/gnome/default/alerts
%{_datadir}/sounds/gnome/default/alerts/*.ogg
%{_sysconfdir}/xdg/menus/gnomecc.menu
%files lang -f %{name}-2.0.lang
%files -n libgnome-control-center1
%defattr (-, root, root)
%{_libdir}/libgnome-control-center.so.1*
%files devel
%defattr (-, root, root)
%{_datadir}/pkgconfig/gnome-default-applications.pc
%{_datadir}/pkgconfig/gnome-keybindings.pc
%files -n libgnome-window-settings1
%defattr (-, root, root)
%dir %{_libdir}/window-manager-settings
%{_libdir}/window-manager-settings/libmetacity.so
%{_libdir}/libgnome-window-settings.so.*
%files -n libgnome-window-settings-devel
%defattr (-, root, root)
%{_includedir}/gnome-window-settings-2.0
%{_libdir}/libgnome-window-settings.so
%{_libdir}/pkgconfig/gnome-window-settings-2.0.pc
%{_libdir}/pkgconfig/libgnome-control-center.pc
%{_includedir}/gnome-control-center-1/
%{_libdir}/*.so
%changelog