pool/firefox-esr
SHA256
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use more portable syntax to check if macro ff_esr_name is defined.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/firefox-esr?expand=0&rev=14
This commit is contained in:
Wolfgang Rosenauer 2019-11-15 07:54:34 +00:00 committed by Git OBS Bridge
parent 167d6d48ad
commit 688c3dcd33
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firefox-esr.changes
View File

@ -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 build log is showing a "No space left on device" error when checking
for unpackaged files in x86_64. 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> Mon Oct 21 13:13:29 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>

10
firefox-esr.spec
View File

@ -17,11 +17,15 @@
# #
# either MozillaFirefox or firefox-esr # either MozillaFirefox or firefox-esr
%define pkgname MozillaFirefox %if "%{ff_esr_name}" != ""
%define pkgname %{ff_esr_name}
%else
%if 0%{?suse_version} > 1549 %if 0%{?suse_version} > 1549
%define pkgname firefox-esr %define pkgname firefox-esr
%else
%define pkgname MozillaFirefox
%endif
%endif %endif
%{?ff_esr_name: %define pkgname %{ff_esr_name}}
# changed with every update # changed with every update
# orig_version vs. mainver: To have beta-builds # orig_version vs. mainver: To have beta-builds
@ -359,7 +363,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
%build %build
%if !%{with only_print_mozconfig} %if !%{with only_print_mozconfig}
# no need to add build time to binaries # 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")\"" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\"" TIME="\"$(date -d "${modified}" "+%%R")\""
find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +