From 67b87408b1035b59da14039d92316d0455b7a3db5dc5f3f9b427a3aeaf0189eb Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 10 Oct 2019 14:11:19 +0000
Subject: [PATCH] - do not build devel subpackage for this variant (not
 required and   creating file conflicts)

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

diff --git a/firefox-esr.changes b/firefox-esr.changes
index d8f31d4..d8858c6 100644
--- a/firefox-esr.changes
+++ b/firefox-esr.changes
@@ -5,6 +5,8 @@ Wed Oct  2 21:08:05 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
 - add mozilla-bmo1585099.patch to fix build with rust >= 1.38
 - extension preferences moved from branding package to core package
   (packaging but not branding specific)
+- do not build devel subpackage for this variant (not required and
+  creating file conflicts)
 
 -------------------------------------------------------------------
 Mon Sep 30 07:19:50 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
diff --git a/firefox-esr.spec b/firefox-esr.spec
index b72e4a4..160e549 100644
--- a/firefox-esr.spec
+++ b/firefox-esr.spec
@@ -31,6 +31,7 @@
 %define orig_suffix    esr
 %define update_channel esr68
 %define branding       1
+%define devpkg         0
 %define releasedate    20190826132627
 
 # always build with GCC as SUSE Security Team requires that
@@ -227,6 +228,7 @@ Mozilla Firefox is a standalone web browser, designed for standards
 compliance and performance.  Its functionality can be enhanced via a
 plethora of extensions.
 
+%if 0%{?devpkg}
 %package devel
 Summary:        Devel package for %{appname}
 Group:          Development/Tools/Other
@@ -237,6 +239,7 @@ Requires:       perl(XML::Simple)
 
 %description devel
 Development files for %{appname} to make packaging of addons easier.
+%endif
 
 %if %localize
 %package translations-common
@@ -617,6 +620,7 @@ rm -f %{buildroot}%{progdir}/update-settings.ini
 # devel
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 %SOURCE12 %{buildroot}%{_bindir}
+%if 0%{?devpkg}
 # inspired by mandriva
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{progname}
@@ -635,12 +639,7 @@ cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{progname}
    %%{__unzip} -q -d "$extdir" "%%1" \
    %%{nil}
 FIN
-# just dumping an xpi file there doesn't work...
-#%%firefox_ext_install() \
-#       extdir="%%{buildroot}%%{firefox_extdir}" \
-#       mkdir -p "$extdir" \
-#       cp "%%1" "$extdir" \
-#       %%{nil}
+%endif
 # fdupes
 %fdupes %{buildroot}%{progdir}
 %fdupes %{buildroot}%{_datadir}
@@ -726,13 +725,14 @@ exit 0
 %doc %{_mandir}/man1/%{progname}.1.gz
 %{_datadir}/appdata/
 
+%if 0%{?devpkg}
 %files devel
 %defattr(-,root,root)
 %{_bindir}/mozilla-get-app-id
 %config %{_sysconfdir}/rpm/macros.%{progname}
+%endif
 
 %if %localize
-
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{progdir}