pool/gnome-shell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 161484 from home:dimstar:branches:GNOME:Factory

Browse Source 
- Drop gnome-shell-nmlibexecdir.patch: this was a temporary
  solution until NetworkManager fixes their .name files
  (bnc#806377).
- Drop gnome-common BuildRequires and call to gnome-autogen.sh, as
  we don't carry patches touching the build system anymore.

- Update to version 3.8.0.1:
  + Background bug fixes (bgo#696712).

OBS-URL: https://build.opensuse.org/request/show/161484
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=160
This commit is contained in:
Dominique Leuenberger 2013-03-29 20:58:31 +00:00 committed by Git OBS Bridge
parent 0f7d33d718
commit 461e773913
5 changed files with 19 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-shell-3.8.0.1.tar.xz Normal file
View File

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

3
gnome-shell-3.8.0.tar.xz
View File

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

65
gnome-shell-nmlibexecdir.patch
View File

@ -1,65 +0,0 @@
commit 75d67086a651a4c46a66c563c8e9618c3a4b2fe2
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon Feb 11 14:00:52 2013 +0100
networkAgent: Allow NetworkManager to use a different libexecdir path
Introducing a --with-nmlibexecdir parameter to configure allows
distributions to split libexecdir for various packages.
Not specifying it results in no change in behaviour.
Index: gnome-shell-3.6.3/configure.ac
===================================================================
--- gnome-shell-3.6.3.orig/configure.ac
+++ gnome-shell-3.6.3/configure.ac
@@ -256,6 +256,13 @@ AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIP
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
+AC_ARG_WITH(nmlibexecdir,
+ AS_HELP_STRING([--with-nmlibexecdir=DIR],
+ [Specify the location where NetworkManager installs its helpers [default=$(libexecdir)]]),
+ [nmlibexecdir="$withval"],
+ [nmlibexecdir="$libexecdir"])
+AC_SUBST(nmlibexecdir)
+
AC_CONFIG_FILES([
Makefile
data/Makefile
Index: gnome-shell-3.6.3/js/Makefile.am
===================================================================
--- gnome-shell-3.6.3.orig/js/Makefile.am
+++ gnome-shell-3.6.3/js/Makefile.am
@@ -12,6 +12,7 @@ misc/config.js: misc/config.js.in Makefi
-e "s|[@]datadir@|$(datadir)|g" \
-e "s|[@]libexecdir@|$(libexecdir)|g" \
-e "s|[@]sysconfdir@|$(sysconfdir)|g" \
+ -e "s|[@]nmlibexecdir@|$(nmlibexecdir)|g" \
$< > $@
jsdir = $(pkgdatadir)/js
Index: gnome-shell-3.6.3/js/misc/config.js.in
===================================================================
--- gnome-shell-3.6.3.orig/js/misc/config.js.in
+++ gnome-shell-3.6.3/js/misc/config.js.in
@@ -13,3 +13,6 @@ const LOCALEDIR = '@datadir@/locale';
/* other standard directories */
const LIBEXECDIR = '@libexecdir@';
const SYSCONFDIR = '@sysconfdir@';
+
+/* Some distros use different libexecdir for NM than for gnome-shell */
+const NMLIBEXECDIR = '@nmlibexecdir@';
Index: gnome-shell-3.6.3/js/ui/components/networkAgent.js
===================================================================
--- gnome-shell-3.6.3.orig/js/ui/components/networkAgent.js
+++ gnome-shell-3.6.3/js/ui/components/networkAgent.js
@@ -686,7 +686,7 @@ const NetworkAgent = new Lang.Class({
} catch(e) { } // ignore errors if key does not exist
let path = binary;
if (!GLib.path_is_absolute(path)) {
- path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
+ path = GLib.build_filenamev([Config.NMLIBEXECDIR, path]);
}
if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

15
gnome-shell.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Mar 27 19:56:08 UTC 2013 - dimstar@opensuse.org
- Drop gnome-shell-nmlibexecdir.patch: this was a temporary
solution until NetworkManager fixes their .name files
(bnc#806377).
- Drop gnome-common BuildRequires and call to gnome-autogen.sh, as
we don't carry patches touching the build system anymore.
-------------------------------------------------------------------
Wed Mar 27 18:30:09 UTC 2013 - dimstar@opensuse.org
- Update to version 3.8.0.1:
+ Background bug fixes (bgo#696712).
-------------------------------------------------------------------
Tue Mar 26 22:37:50 UTC 2013 - dimstar@opensuse.org

9
gnome-shell.spec
View File

@ -17,20 +17,16 @@
Name: gnome-shell
Version: 3.8.0
Version: 3.8.0.1
Release: 0
Summary: GNOME Shell
License: GPL-2.0+
Group: System/GUI/GNOME
Url: http://live.gnome.org/GnomeShell
Source: http://download.gnome.org/sources/gnome-shell/3.8/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar@opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell
Patch0: gnome-shell-nmlibexecdir.patch
# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
BuildRequires: docbook-xsl-stylesheets
# Needed for patch0
BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
@ -136,13 +132,10 @@ to enable, disable and install them.
%lang_package
%prep
%setup -q
%patch0 -p1
#patch1 -p1
translation-update-upstream
%build
# Needed for patch0
NOCONFIGURE=1 gnome-autogen.sh
export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
%configure \
--disable-static \