From 26474433f2ce25ccca9ff550b791cc98bf6cbc06bb28d17839625fa186b2a5fc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Nov 2015 12:58:49 +0000 Subject: [PATCH] Accepting request 341748 from home:Zaitor:branches:GNOME:Factory I somehow suspect that all "migrants" from a gnome2 base have arrived already, and if they haven't I doubt they will go straight for Tumbleweed, so deeming this as safe now. OBS-URL: https://build.opensuse.org/request/show/341748 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=148 --- gnome-terminal.changes | 7 +++++++ gnome-terminal.spec | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gnome-terminal.changes b/gnome-terminal.changes index e99a022..e13218f 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 30 22:37:54 UTC 2015 - zaitor@opensuse.org + +- Drop gconf2 Requires(pre), and pass --disable-migration to + configure. We do not expect any holdouts to migrate any longer. +- Stop running autoreconf as patches are already disabled. + ------------------------------------------------------------------- Mon Oct 12 18:04:10 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-terminal.spec b/gnome-terminal.spec index c8cba16..00f3703 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -57,7 +57,6 @@ Recommends: %{name}-lang Obsoletes: gnome-core BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): filesystem -Requires(pre): gconf2 %description This package provides the GNOME terminal emulator application. @@ -94,9 +93,10 @@ translation-update-upstream %build # Needed for patch102 -autoreconf -fiv +#autoreconf -fiv %configure \ --disable-static \ + --disable-migration \ --with-gtk=3.0 \ --with-nautilus-extension make %{?_smp_mflags} @@ -127,7 +127,6 @@ rm -rf %{buildroot} %dir %{_datadir}/appdata %{_datadir}/appdata/gnome-terminal.appdata.xml %{_datadir}/applications/gnome-terminal.desktop -%{_libexecdir}/gnome-terminal-migration %{_libexecdir}/gnome-terminal-server %{_datadir}/dbus-1/services/org.gnome.Terminal.service %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml