From 3b0e72fa3f1c72b503dca0826e3d01b4a18d5ba42966272d4ac79f01ac106a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 15 Jun 2016 11:12:22 +0000 Subject: [PATCH] Accepting request 402097 from home:Zaitor:branches:GNOME:Factory Rebase - now without wayland by default OBS-URL: https://build.opensuse.org/request/show/402097 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=232 --- gnome-session.changes | 17 +++++++++++++++++ gnome-session.spec | 26 +++++++++++--------------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index a6632b5..42493b9 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 25 21:46:08 UTC 2016 - zaitor@opensuse.org + +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. +- Change gnome-session-ice-auth-for-suid.patch patch tag to + PATCH-FIX-SLE, and only apply for non-opensuse. Same for + gnome-common BuildRequires and NOCONFIGURE call. +- Add xsltproc BuildRequries: Needed for man pages, pulled in by + gnome-common before. +- Drop no longer needed Provides and Obsoletes: gnome-core, + gnome-session-branding, gnome-session-gtk1-support, + gnome-session-splash, gnome-session-fallback-session and + gnome2-look-and-feel. +- Drop hicolor-icon-theme BuildRequires: We rely on Adwaita now, + and that is always provided by gtk3. + ------------------------------------------------------------------- Tue Apr 12 08:51:58 UTC 2016 - dimstar@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index f8ad8f0..7957434 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -26,15 +26,19 @@ Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-session/3.20/%{name}-%{version}.tar.xz Source1: gnome Source2: gnome.desktop -# PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var. +# PATCH-FIX-SLE gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var. Patch0: gnome-session-ice-auth-for-suid.patch BuildRequires: fdupes +%if !0%{?is_opensuse} BuildRequires: gnome-common -BuildRequires: hicolor-icon-theme +%endif BuildRequires: intltool BuildRequires: tcpd-devel +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: update-desktop-files +BuildRequires: xsltproc BuildRequires: pkgconfig(dbus-glib-1) >= 0.76 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.35.0 BuildRequires: pkgconfig(gl) @@ -56,17 +60,6 @@ BuildRequires: pkgconfig(xtst) Requires: %{name}-core = %{version} Requires: %{name}-default-session = %{version} Recommends: %{name}-lang -Obsoletes: gnome-core -# There's no splash anymore, so no branding package. -Provides: %{name}-branding = %{version} -Obsoletes: %{name}-branding < %{version} -# Obsolete helpers that were in subpackages and that have been removed -Obsoletes: gnome-session-gtk1-support <= 2.31 -Obsoletes: gnome-session-splash <= 2.31 -# the fallback session was dropped in gnome 3.8. -Obsoletes: gnome-session-fallback-session < 3.8 -# Since GNOME 3.8.0, the 'classic' mode is provided by gnome-shell-extensions. -Obsoletes: gnome2-look-and-feel <= 3.8.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -110,12 +103,15 @@ functional GNOME desktop. %prep %setup -q -# Disabled, as it fails -#translation-update-upstream +%if !0%{?is_opensuse} +translation-update-upstream %patch0 -p1 +%endif %build +%if !0%{?is_opensuse} NOCONFIGURE=1 gnome-autogen.sh +%endif %configure \ --enable-systemd \ --disable-gconf