From 688c3dcd3302ef0187d86196b2420da6d1417c8100bb377800bf1c5ad74251ba Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 15 Nov 2019 07:54:34 +0000
Subject: [PATCH] - Use more portable syntax to check if macro ff_esr_name is
 defined.

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/firefox-esr?expand=0&rev=14
---
 firefox-esr.changes |  5 +++++
 firefox-esr.spec    | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/firefox-esr.changes b/firefox-esr.changes
index 27cf3d5..988d6b3 100644
--- a/firefox-esr.changes
+++ b/firefox-esr.changes
@@ -5,6 +5,11 @@ Thu Nov 14 09:51:00 UTC 2019 - Antonio Larrosa <alarrosa@suse.com>
   build log is showing a "No space left on device" error when checking
   for unpackaged files in x86_64.
 
+-------------------------------------------------------------------
+Sun Nov 10 19:01:32 UTC 2019 - Manfred Hollstein <manfred.h@gmx.net>
+
+- Use more portable syntax to check if macro ff_esr_name is defined.
+
 -------------------------------------------------------------------
 Mon Oct 21 13:13:29 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/firefox-esr.spec b/firefox-esr.spec
index 495c52e..a6885e2 100644
--- a/firefox-esr.spec
+++ b/firefox-esr.spec
@@ -17,11 +17,15 @@
 #
 
 # either MozillaFirefox or firefox-esr
-%define pkgname  MozillaFirefox
+%if "%{ff_esr_name}" != ""
+%define pkgname %{ff_esr_name}
+%else
 %if 0%{?suse_version} > 1549
 %define pkgname  firefox-esr
+%else
+%define pkgname  MozillaFirefox
+%endif
 %endif
-%{?ff_esr_name: %define pkgname %{ff_esr_name}}
 
 # changed with every update
 # orig_version vs. mainver: To have beta-builds
@@ -359,7 +363,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 %build
 %if !%{with only_print_mozconfig}
 # no need to add build time to binaries
-modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
+modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{pkgname}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
 find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +