Accepting request 67399 from GNOME:Next

thanks

OBS-URL: https://build.opensuse.org/request/show/67399
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=53
This commit is contained in:
Vincent Untz 2011-04-25 14:56:38 +00:00 committed by Git OBS Bridge
parent 92fa4d235f
commit b47504fcb9
10 changed files with 338 additions and 178 deletions

View File

@ -0,0 +1,13 @@
Index: gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in
===================================================================
--- gnome-shell-2.91.91.orig/data/org.gnome.shell.gschema.xml.in
+++ gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in
@@ -30,7 +30,7 @@
</_description>
</key>
<key name="favorite-apps" type="as">
- <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
+ <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
<_summary>List of desktop file IDs for favorite applications</_summary>
<_description>
The applications corresponding to these identifiers

View File

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

View File

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

View File

@ -0,0 +1,20 @@
--- g-s/src/main.c
+++ g-s/src/main.c
@@ -458,3 +458,17 @@ main (int argc, char **argv)
return meta_run ();
}
+
+#if HAVE_BLUETOOTH
+/* HACK:
+ Add a non-static function that calls into libgnome-bluetooth-applet.so,
+ to avoid the linker being too smart and removing the dependency.
+ This function is never actually called.
+*/
+extern GType bluetooth_applet_get_type(void);
+void _shell_link_to_bluetooth(void);
+
+void _shell_link_to_bluetooth(void) {
+ bluetooth_applet_get_type();
+}
+#endif

View File

@ -1,15 +0,0 @@
Index: gnome-shell-2.91.6/src/gnome-shell.in
===================================================================
--- gnome-shell-2.91.6.orig/src/gnome-shell.in
+++ gnome-shell-2.91.6/src/gnome-shell.in
@@ -192,7 +192,9 @@ def _get_glx_extensions():
glxinfo = subprocess.Popen(["glxinfo"], stdout=subprocess.PIPE)
glxinfo_output = glxinfo.communicate()[0]
- glxinfo.wait()
+ ret = glxinfo.wait()
+ if ret != 0:
+ return (set(), set(), set())
glxinfo_map = {}
for m in GLXINFO_RE.finditer(glxinfo_output):

View File

@ -1,111 +0,0 @@
Index: gnome-shell-2.91.6/js/ui/status/accessibility.js
===================================================================
--- gnome-shell-2.91.6.orig/js/ui/status/accessibility.js
+++ gnome-shell-2.91.6/js/ui/status/accessibility.js
@@ -77,39 +77,39 @@ ATIndicator.prototype = {
client.add_dir(KEY_META_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
client.notify_add(KEY_META_DIR, Lang.bind(this, this._keyChanged), null, null);
- let highContrast = this._buildHCItem();
- this.menu.addMenuItem(highContrast);
+ // let highContrast = this._buildHCItem();
+ // this.menu.addMenuItem(highContrast);
let magnifier = this._buildItem(_("Zoom"), MAGNIFIER_SCHEMA, 'show-magnifier');
this.menu.addMenuItem(magnifier);
- let textZoom = this._buildFontItem();
- this.menu.addMenuItem(textZoom);
+ // let textZoom = this._buildFontItem();
+ // this.menu.addMenuItem(textZoom);
- let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
- this.menu.addMenuItem(screenReader);
+ // let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
+ // this.menu.addMenuItem(screenReader);
- let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
- this.menu.addMenuItem(screenKeyboard);
+ // let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
+ // this.menu.addMenuItem(screenKeyboard);
let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
this.menu.addMenuItem(visualBell);
- let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
- this.menu.addMenuItem(stickyKeys);
+ // let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
+ // this.menu.addMenuItem(stickyKeys);
- let slowKeys = this._buildItem(_("Slow Keys"), A11Y_SCHEMA, KEY_SLOW_KEYS_ENABLED);
- this.menu.addMenuItem(slowKeys);
+ // let slowKeys = this._buildItem(_("Slow Keys"), A11Y_SCHEMA, KEY_SLOW_KEYS_ENABLED);
+ // this.menu.addMenuItem(slowKeys);
- let bounceKeys = this._buildItem(_("Bounce Keys"), A11Y_SCHEMA, KEY_BOUNCE_KEYS_ENABLED);
- this.menu.addMenuItem(bounceKeys);
+ // let bounceKeys = this._buildItem(_("Bounce Keys"), A11Y_SCHEMA, KEY_BOUNCE_KEYS_ENABLED);
+ // this.menu.addMenuItem(bounceKeys);
- let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
- this.menu.addMenuItem(mouseKeys);
+ // let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
+ // this.menu.addMenuItem(mouseKeys);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addAction(_("Universal Access Settings"), function() {
- Util.spawnDesktop('gnome-universal-access-panel');
+ Util.spawnDesktop('at-properties');
});
},
Index: gnome-shell-2.91.6/js/ui/panel.js
===================================================================
--- gnome-shell-2.91.6.orig/js/ui/panel.js
+++ gnome-shell-2.91.6/js/ui/panel.js
@@ -33,12 +33,11 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100
const SPINNER_UPDATE_TIMEOUT = 130;
const SPINNER_SPEED = 0.02;
-const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
+const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'volume', 'bluetooth', 'network', 'battery'];
const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
'a11y': imports.ui.status.accessibility.ATIndicator,
'volume': imports.ui.status.volume.Indicator,
'battery': imports.ui.status.power.Indicator,
- 'keyboard': imports.ui.status.keyboard.XKBIndicator
};
if (Config.HAVE_BLUETOOTH)
Index: gnome-shell-2.91.6/js/ui/statusMenu.js
===================================================================
--- gnome-shell-2.91.6.orig/js/ui/statusMenu.js
+++ gnome-shell-2.91.6/js/ui/statusMenu.js
@@ -154,12 +154,12 @@ StatusMenuButton.prototype = {
_onMyAccountActivate: function() {
Main.overview.hide();
- Util.spawnDesktop('gnome-user-accounts-panel');
+ Util.spawnDesktop('gnome-about-me');
},
_onPreferencesActivate: function() {
Main.overview.hide();
- Util.spawnDesktop('gnome-control-center');
+ Util.spawnDesktop('gnomecc');
},
_onLockScreenActivate: function() {
Index: gnome-shell-2.91.6/js/ui/dateMenu.js
===================================================================
--- gnome-shell-2.91.6.orig/js/ui/dateMenu.js
+++ gnome-shell-2.91.6/js/ui/dateMenu.js
@@ -200,7 +200,7 @@ DateMenuButton.prototype = {
_onPreferencesActivate: function() {
this.menu.close();
- Util.spawnDesktop('gnome-datetime-panel');
+ Util.spawnDesktop('YaST2-timezone');
},
_onOpenCalendarActivate: function() {

View File

@ -1,12 +0,0 @@
#!/bin/bash
#
# Script to start a GNOME session in a GNOME 3 preview mode.
#
if test -n "$XDG_CONFIG_DIRS"; then
export XDG_CONFIG_DIRS=/usr/share/gnome-shell/xdg-override:$XDG_CONFIG_DIRS
else
export XDG_CONFIG_DIRS=/usr/share/gnome-shell/xdg-override:/etc/xdg
fi
exec /usr/bin/gnome $*

View File

@ -1,3 +1,285 @@
-------------------------------------------------------------------
Thu Apr 7 08:43:28 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0.2:
+ bgo#646333: fix missing import that was preventing extensions
from loading.
+ Updated translations.
-------------------------------------------------------------------
Wed Apr 6 08:59:23 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0.1:
+ bgo#646825: fix problem with stuck event handling if network
menu pops down while user is using the scrollbar.
-------------------------------------------------------------------
Tue Apr 5 16:19:09 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0:
+ Add shell_get_file_contents_utf8_sync(), use it instead of gio
temporarily.
+ gnome-shell.css: fix multiple calendar layout issues
+ network: fix alignment of secure vs insecure wireless icons
+ end-session-dialog: Show default icon if user icon is unset
+ use scrollbar in sub-menu if needed
+ NetworkMenu: fix parameters to _findConnection
+ NetworkMenu: fix VPN connection state
+ NetworkMenu: keep the connection list visible when connecting.
+ NetworkStatus: ignore invalid and unsupported connection types
+ notificationDaemon: only ignore 'chat' and 'presence'
notifications from Empathy (bgo#645932)
+ network: fix logic bug in checking whether to activate or
deactive.
+ Updated translations.
- Drop 0001-src-add-more-stuff-to-gnome_shell_real_LDADD.patch: no
longer needed.
-------------------------------------------------------------------
Tue Mar 29 08:39:21 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.93:
+ Move GSettings schemas under /org/gnome
+ Telepathy chat in message tray:
- Add proper timestamps between old messages and log messages,
gray out log messages.
- Fix duplicate messages
+ Network indicator:
- Show "firmware missing" when firmware is not available
- Mark WEP/WPA wireless networks with a security icon
- Misc bug fixes
+ If present, put the IBus status tray icon in the system status
area.
+ Look for preferences panel destop files in gnomecc.menus not in
settings.menus.
+ Change implementation of --replace so that we don't connect to
XSMP and trigger a gnome-session restart loop.
+ Restore accesss to notifications associated with legacy status
icons.
+ Fix badly aligned and fuzzy toggle switches in menus.
+ Fix flash of Activities button when entering hot corner.
+ Fix visual artifacts during message tray animations.
+ Fix URL links in notifications.
+ Fix positioning and animations for menus and notification
bubbles.
+ Fix bug that would result in left-over application menu when no
application is active.
+ Fixes to translated strings.
+ Misc bug fixes.
+ Build fixes
+ Updated translations.
- Changes from version 2.91.92:
+ New network indicator for NetworkManager 0.9. This mostly
completes replacing all legacy status icons in the status area
with native implementations. If NetworkManager 0.9 is not
found, the old nm-applet status icon will be shown in the
status area as before.
+ Multi monitor improvements:
- Rewrite window positioning code to enable multi-monitor
goodness.
- Enable new Mutter feature workspaces_only_on_primary so that
workspace switching only affects the primary monitor and
windows on other monitors are unaffected.
- In the overview, show windows for each monitor on that
monitor rather than scrunching them oddly onto the primary
monitor.
- Use new "pointer barriers" feature of XFixes extension to
trap the mouse cursor at hot screen corners even when there
are adjacent monitors the cursor could slide onto.
- Don't use a slideout for the workspace selector if it's at a
monitor boundary.
+ Message Tray:
- Combine multiple notifications from the same source into a
"stack" instead of filling the summary area with identical
icons.
- Queue up incoming notifications while the user is interacting
with the summary area.
- Don't show resident (permanent) notifications from apps that
are currently active.
- Improve styling of items in the message tray to make click
targets and states more obvious.
- For legacy status icons, forward clicks on the message tray
label to the icon.
- For legacy status icons, kick out of the Activies Overview
when the icon or label is clicked.
- Fix scrolling to the bottom when new messages arrive
- Misc bug fixes
+ Greatly speed up search by not creating objects for
non-displayed results.
+ Fix long delay on entering overview on certain AMD cards by not
repeatedly looking for the actor at pointer.
+ Message Tray chat:
- Add history navigation to entry
- Handle and display aliases correctly
- Carry conversations across shell restart
- Support "actions" like the IRC /me command
- Retrieve chat history from TelepathyLogger
+ When removing an empty workspace, merge it with the empty
workspace and enter the overview instead of animating to a
random adjacent workspace.
+ Performance testing framework
- Use standardized window confgurations instead of whatever
windows the user has around.
- Add new performance metrics for switching to the app view and
for overview performance with different numbers of windows
open.
+ Fix up StTooltip (fix bugs, add hover timeouts, and constrain
tooltips to monitors) and use to display labels on hover over
applications in the Dash.
+ Allow dragging over the workspace selector during a XDND drag
to change workspaces.
+ Add Restart button to shutdown dialog.
+ Remove Screen Reader and Screen Keyboard from Accessibility
menu; not ready to be a prominent feature of GNOME 3.0, though
still available through System Settings.
+ Honor relevant lockdown GSettings keys
+ Improve appearance of PolicyKit dialogs
+ Fixes for RTL layout
+ Remove sliding startup indicator in favor of a fixed one
+ Obey global GNOME text size setting
+ Visual tweaks
+ Code cleanups
+ Build fixes
+ Bug fixes
- Changes from version 2.91.91:
+ Create a real gnome-shell executable using the new
libmutter-wm.
+ Launcher script:
- Don't use the launcher script installed except when built
with --enable-jhbuild-wrapper-script configure option
- Remove --eval-file option
- Move --create-extension option to separate
gnome-shell-extension-tool script
- Remove complicated checks to force indirect rendering for
DRI1.
+ Push status from user menu to Telepathy.
+ Message tray:
- Add a right click menu with Open/Remove options
- Remove icons when the associated application exits
+ Add keynav around the overview using Control-Alt-Tab
+ Update style of search display [Florian]
+ Move calendar handling out of process to avoid probplems if
evolution-data-server blocks on network traffic.
+ Put one hot corner to activate the Activities Overview on each
monitor.
+ Try to handle apps with initial splashscreen in automatic
workspace management code.
+ Show the "New Window" menu item even for non-running
applications.
+ Allow mouse-wheel scrolling over categories in application
browser.
+ Scale icons rather than using small icons in the overview and
Alt-Tab.
+ StWidget: automatically add rtl/ltr pseudoclasses depending on
the direction of the locale.
+ StWidget: add a popup-menu signal
+ Fixes for right-to-left locales
+ Claim D-Bus names early to avoid race conditions where the old
notification daemon could be started by D-Bus activation.
+ Drop the custom gs-applications.menu and use the standard GNOME
menu files for categories.
+ Visual tweaks
+ Code cleanups
+ Build fixes
+ Bug fixes
+ Updated translations.
- Drop gnome-shell-handle-broken-glxinfo.patch: obsolete.
- Add 0001-src-add-more-stuff-to-gnome_shell_real_LDADD.patch and
gnome-shell-fix-gnome-bluetooth.patch: fix startup
- Add default-applications.patch to fix Firefox launcher for 11.4
- Remove old gnome3 preview session, obsolete with full GNOME3.
- Add BuildRequires pkgconfig(libmutter), pkgconfig(libnm-glib),
pkgconfig(telepathy-logger-0.2)
-------------------------------------------------------------------
Fri Mar 4 09:10:17 CET 2011 - vuntz@opensuse.org
- Drop BUILD_AGAINST_GNOME3 magic: now we always build for GNOME 3:
+ Always have a gnome-settings-daemon Requires.
+ Drop gnome-shell-integrate_114.patch.
-------------------------------------------------------------------
Fri Mar 2 10:21:22 CET 2011 - fcrozat@novell.com
- Update to version 2.91.90:
+ Workspace handling
- Replace existing workspace controls in the overview with a
vertical list of workspace thumbnails.
- Change workspace orientation in the main view to vertical
- Workspaces are automatically managed: empty workspaces are
removed, other than the last workspace which is always empty,
a new workspace is added when something is started on that
workspace.
- Add ability to change workspace by mousewheel scrolling over
thumbnails
+ Add a PolicyKit authentication agent; requests to the user for
authentication from PolicyKit now show up as shell-themed
dialogs.
+ Visual refresh
- Improve the appearance and behavior of the overview "dash"
- Use larger icons in the Application browser
- Improve the appearance of the top panel and round the corners
of the screen
- Improve the appearance of the search entry in the overview
+ Remove minimize and maximize buttons from the titlebar
+ Change the options for stopping the system; Suspend is now in
the menu, while Power Off... is hidden, but can be accessed by
holding down Alt when browsing the user status menu
+ Port telepathy integration to telepathy-glib from hand-written
D-Bus code
+ Remove the window filtering and highlighting when using the
dash application menu - it was confusing and buggy rather than
helpful
+ Use the alt-tab switcher when <Alt>Above_Tab (alt-` typically)
is pressed, and fix keybinding handling durng alt-tab.
+ Message tray
- Improve the expand/collapse behavior of for greater stability
- Hold notifications while the user is marked busy
- Group chat messages together
- Fix bug that resulted in missing icons for contacts without
avatars
- Enable navigation using arrow keys between buttons in
notifications
+ Add audio feedback when scrolling over the volume status icon
+ Add a "Show Layout" item to the input source selector menu
+ Use GLib application launching API, to allow us to associate
windows with applications in a broader range of circumstances
+ Unify history management between run dialog and looking glass,
giving consistent behavior
+ Pass extension metadata object to extensions so they can be
configured in metadata.json
+ Support symbolic colors for legacy tray icons
+ Shell Toolkit: implement ability to specify inset shadows in
CSS
+ Remove no-longer-useful --xephyr option from gnome-shell
wrapper script
+ Improve the drawing of the "box pointer" used for menus and
notifications
+ Memory leak fixes
+ Code cleanups
+ Bug fixes
+ Build fixes
+ Visual tweaks
+ Bugs fixed: bgo#588050, bgo#594071, bgo#594324, bgo#597859, bgo#599334,
bgo#600771, bgo#603759, bgo#604237, bgo#609791, bgo#610818, bgo#612548,
bgo#617225, bgo#620416, bgo#631995, bgo#632595, bgo#633667, bgo#636156,
bgo#636370, bgo#636680, bgo#637687, bgo#637745, bgo#638720, bgo#638990,
bgo#639324, bgo#639341, bgo#639428, bgo#639468, bgo#639943, bgo#640361,
bgo#640363, bgo#640465, bgo#640583, bgo#640976, bgo#640978, bgo#640996,
bgo#641060, bgo#641117, bgo#641245, bgo#641359, bgo#641415, bgo#641522,
bgo#641533, bgo#641537, bgo#641538, bgo#641605, bgo#641677, bgo#641726,
bgo#641728, bgo#641809, bgo#641810, bgo#641879, bgo#641880, bgo#641881,
bgo#641886, bgo#641887, bgo#641896, bgo#641931, bgo#641973, bgo#641977,
bgo#641987, bgo#642005, bgo#642031, bgo#642034, bgo#642058, bgo#642059,
bgo#642117, bgo#642124, bgo#642175, bgo#642189, bgo#642192, bgo#642194,
bgo#642196, bgo#642207, bgo#642208, bgo#642209, bgo#642237, bgo#642287,
bgo#642295, bgo#642303, bgo#642329, bgo#642333, bgo#642334, bgo#642335,
bgo#642483, bgo#642510, bgo#642600, bgo#642641, bgo#642672, bgo#642697,
bgo#642699, bgo#642721, bgo#642726, bgo#642834, bgo#642886, bgo#642925.
+ Updated translations.
- Add pkgconfig(gnome-bluetooth-1.0), pkgconfig(polkit-agent-1) and
pkgconfig(telepathy-glib) BuildRequires.
-------------------------------------------------------------------
Fri Feb 18 02:49:38 CET 2011 - vuntz@opensuse.org

View File

@ -18,30 +18,26 @@
Name: gnome-shell
Version: 2.91.6
Release: 8
# FIXME: whenever we have GNOME3 as default desktop, remove BUILD_AGAINST_GNOME3 stuff, and gnome-shell-old-gsd.patch
Version: 3.0.0.2
Release: 1
License: GPLv2+
Summary: GNOME Shell
Group: System/GUI/GNOME
Url: http://live.gnome.org/GnomeShell
Source: %{name}-%{version}.tar.bz2
# To integrate a preview mode in GDM.
# Note: this also explains the Requires on gnome-session below.
Source1: gnome-shell-session
Source2: gnome3.desktop
# PATCH-FIX-OPENSUSE gnome-shell-integrate_114.patch vuntz@opensuse.org -- Fix integration with underlying packages available in openSUSE 11.4.
Patch0: gnome-shell-integrate_114.patch
# PATCH-FIX-UPSTREAM gnome-shell-handle-broken-glxinfo.patch bnc#672953 bgo#640680 vuntz@opensuse.org -- Fix crash on startup if glxinfo fails with a weird error
Patch1: gnome-shell-handle-broken-glxinfo.patch
Patch1: gnome-shell-fix-gnome-bluetooth.patch
Patch2: default-applications.patch
BuildRequires: intltool
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gjs-1.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0)
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-0.10)
@ -51,19 +47,22 @@ BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libcroco-0.6)
BuildRequires: pkgconfig(libedataserver-1.2)
BuildRequires: pkgconfig(libgnome-menu)
BuildRequires: pkgconfig(libmutter)
BuildRequires: pkgconfig(libnm-glib) >= 0.8.995
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(mutter-plugins)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: pkgconfig(telepathy-logger-0.2)
BuildRequires: pkgconfig(xfixes)
Requires: dbus-1-python
Requires: gdk-pixbuf-loader-rsvg
Requires: gjs
Requires: gnome-icon-theme-symbolic
Requires: gnome-session
%if 0%{?BUILD_AGAINST_GNOME3}
# For a GSettings schema
Requires: gnome-settings-daemon
%endif
Requires: gsettings-desktop-schemas
# mutter-devel doesn't automatically bring mutter
Requires: mutter
@ -83,18 +82,18 @@ documents, and organizing open windows in GNOME.
%prep
%setup -q
translation-update-upstream
%if ! 0%{?BUILD_AGAINST_GNOME3}
%patch0 -p1
%endif
%patch1 -p1
%if 0%{?suse_version} >= 1140
%patch2 -p1
%endif
%build
%configure \
--disable-static \
--libexecdir=%{_libexecdir}/%{name} \
--disable-static \
--libexecdir=%{_libexecdir}/%{name} \
--disable-schemas-install \
--enable-compile-warnings=no
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} V=1
%install
%makeinstall
@ -102,13 +101,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %{?no_lang_C}
%suse_update_desktop_file %{name}
%find_gconf_schemas
# Preview mode for GNOME 3
install -m755 %{S:1} %{buildroot}%{_libexecdir}/%{name}/
install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome3.desktop
install -d -m755 %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart
cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/
%clean
rm -rf %{buildroot}
@ -131,17 +123,15 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc COPYING
%{_bindir}/gnome-shell
%{_bindir}/gnome-shell-extension-tool
%{_libexecdir}/gnome-shell/
%if "%{_libdir}" != "%{_libexecdir}"
%{_libdir}/gnome-shell/
%endif
%{_libdir}/mutter/plugins/libgnome-shell.so
%{_datadir}/applications/gnome-shell.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.accessibility.magnifier.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
%{_datadir}/gnome-shell/
%{_datadir}/xsessions/gnome3.desktop
%{_sysconfdir}/xdg/menus/gs-applications.menu
%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
%doc %{_mandir}/man?/gnome-shell.*
%files lang -f %{name}.lang

View File

@ -1,7 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=/usr/lib/gnome-shell/gnome-shell-session
TryExec=/usr/lib/gnome-shell/gnome-shell-session
Name=GNOME 3 Preview
Comment=The GNU Network Object Model Environment. A complete, free and easy-to-use desktop environment