From 8e0ef021eb5e412f1135be02156cc79d47585713dca95e276b7b57b7dc92e30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Tue, 5 Dec 2017 03:20:28 +0000
Subject: [PATCH] Accepting request 548433 from home:Zaitor

- Drop update-desktop-files BuildRequires and no longer pass
  suse_update_desktop_file macro, not needed anymore.
- Drop eog2 Provides and Obsoletes, no current openSUSE release
  have ever had eog2.
- Modernize spec, use autosetup and make_build macros.

OBS-URL: https://build.opensuse.org/request/show/548433
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=237
---
 eog.changes | 9 +++++++++
 eog.spec    | 8 ++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/eog.changes b/eog.changes
index 0f0aaea..0460aea 100644
--- a/eog.changes
+++ b/eog.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Nov 10 16:37:03 UTC 2017 - zaitor@opensuse.org
+
+- Drop update-desktop-files BuildRequires and no longer pass
+  suse_update_desktop_file macro, not needed anymore.
+- Drop eog2 Provides and Obsoletes, no current openSUSE release
+  have ever had eog2.
+- Modernize spec, use autosetup and make_build macros.
+
 -------------------------------------------------------------------
 Thu Nov  9 07:23:58 UTC 2017 - fezhang@suse.com
 
diff --git a/eog.spec b/eog.spec
index 3f506cd..8a0b457 100644
--- a/eog.spec
+++ b/eog.spec
@@ -27,7 +27,6 @@ Source:         http://download.gnome.org/sources/eog/3.26/%{name}-%{version}.ta
 BuildRequires:  fdupes
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(exempi-2.0) >= 1.99.5
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.36.5
@@ -41,8 +40,6 @@ BuildRequires:  pkgconfig(libpeas-gtk-1.0) >= 0.7.4
 BuildRequires:  pkgconfig(librsvg-2.0) >= 2.36.2
 BuildRequires:  pkgconfig(shared-mime-info)
 Recommends:     %{name}-lang
-Provides:       eog2 = %{version}
-Obsoletes:      eog2 < %{version}
 %if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
 %endif
@@ -67,18 +64,17 @@ eog plugins.
 %lang_package
 
 %prep
-%setup -q
+%autosetup
 %if !0%{?is_opensuse}
 translation-update-upstream
 %endif
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
-%suse_update_desktop_file %{name}
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}