From 4c429c4bd3e4915813b681dfcf5a060e88694f96 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 4 Sep 2018 23:17:14 -0400 Subject: test palemoon with devtoolset-7-toolchain --- palemoon/palemoon.spec | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index df52b72..1a7f1f8 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -24,7 +24,9 @@ BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: gcc %if 0%{?el7} -BuildRequires: gcc49 +#BuildRequires: gcc49 +# already includes the sclo and scl-rh repos? +BuildRequires: devtoolset-7-toolchain %endif BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -61,18 +63,32 @@ and themes to make the browser truly your own. %build %if 0%{?el7} -source /usr/bin/gcc49 -%endif -%if !%{dummy_package} -./mach build + #source /usr/bin/gcc49 + %if !%{dummy_package} + thispwd=$( pwd ) + sci enable devtoolset-7 /bin/bash << EOF + pushd $thispwd + ./mach build + popd +EOF + %endif +%else + %if !%{dummy_package} + ./mach build + %endif %endif %install -%if 0%{?el7} -source /usr/bin/gcc49 -%endif +#%if 0%{?el7} +#source /usr/bin/gcc49 +#%endif rm -rf %{buildroot} +%if 0%{?el7} +thispwd=$( pwd ) +scl enable devtoolset-7 /bin/bash << EOF +pushd $thispwd +%endif %if !%{dummy_package} make -f client.mk \ DESTDIR=%{buildroot} \ @@ -82,6 +98,10 @@ make -f client.mk \ sdkdir=%{_libdir}/%{name}-devel \ install %endif +%if 0%{?el7} +EOF +popd +%endif # cleanup %{__rm} -rf %{buildroot}%{_datadir}/idl/%{pkgname} \ -- cgit From ce97f845ef5b2cf3fcb58d0bf757ea606f55080f Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 4 Sep 2018 23:27:39 -0400 Subject: fix typo for scl --- palemoon/palemoon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 1a7f1f8..8c34bb0 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -66,7 +66,7 @@ and themes to make the browser truly your own. #source /usr/bin/gcc49 %if !%{dummy_package} thispwd=$( pwd ) - sci enable devtoolset-7 /bin/bash << EOF + scl enable devtoolset-7 /bin/bash << EOF pushd $thispwd ./mach build popd -- cgit From ca081174207870451d5baa24bba99b67c73ae597 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 5 Sep 2018 06:25:59 -0400 Subject: rearrange popd --- palemoon/palemoon.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 8c34bb0..40de2a4 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -62,20 +62,17 @@ and themes to make the browser truly your own. %{__cp} %{SOURCE1} ./.mozconfig %build +thispwd=$( pwd ) +%if 0%{?el7} +scl enable detoolset-7 /bin/bash << EOF +pushd $thispwd +%endif +%if !%{dummy_package} +./mach build +%endif %if 0%{?el7} - #source /usr/bin/gcc49 - %if !%{dummy_package} - thispwd=$( pwd ) - scl enable devtoolset-7 /bin/bash << EOF - pushd $thispwd - ./mach build - popd +popd || : EOF - %endif -%else - %if !%{dummy_package} - ./mach build - %endif %endif %install @@ -99,8 +96,8 @@ make -f client.mk \ install %endif %if 0%{?el7} +popd || : EOF -popd %endif # cleanup -- cgit From a30e43fb8bf94bb3c70494bb319ceb279b33df15 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 5 Sep 2018 06:35:40 -0400 Subject: fix typo again in scl... --- palemoon/palemoon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 40de2a4..4ebbf33 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -64,7 +64,7 @@ and themes to make the browser truly your own. %build thispwd=$( pwd ) %if 0%{?el7} -scl enable detoolset-7 /bin/bash << EOF +scl enable devtoolset-7 /bin/bash << EOF pushd $thispwd %endif %if !%{dummy_package} -- cgit From d18b175f51154605657772679830a1c5b655c461 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 5 Sep 2018 20:46:37 -0400 Subject: fix comments and %if statements --- palemoon/palemoon.spec | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 4ebbf33..d0f3bf2 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -5,7 +5,7 @@ Name: palemoon Version: 28.0.0 -Release: 0 +Release: 1 Summary: Pale Moon web browser Group: Networking/Web @@ -24,8 +24,7 @@ BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: gcc %if 0%{?el7} -#BuildRequires: gcc49 -# already includes the sclo and scl-rh repos? +# from repo sclo or scl-rh BuildRequires: devtoolset-7-toolchain %endif BuildRequires: gcc-c++ @@ -62,41 +61,40 @@ and themes to make the browser truly your own. %{__cp} %{SOURCE1} ./.mozconfig %build -thispwd=$( pwd ) +# when version < 28.0.0 it needed gcc 4.9 +#source /usr/bin/gcc49 %if 0%{?el7} -scl enable devtoolset-7 /bin/bash << EOF -pushd $thispwd + thispwd=$( pwd ) + scl enable devtoolset-7 /bin/bash << EOF + pushd $thispwd %endif %if !%{dummy_package} -./mach build + ./mach build %endif %if 0%{?el7} -popd || : + popd || : EOF %endif %install -#%if 0%{?el7} -#source /usr/bin/gcc49 -#%endif rm -rf %{buildroot} %if 0%{?el7} -thispwd=$( pwd ) -scl enable devtoolset-7 /bin/bash << EOF -pushd $thispwd + thispwd=$( pwd ) + scl enable devtoolset-7 /bin/bash << EOF + pushd $thispwd %endif %if !%{dummy_package} -make -f client.mk \ - DESTDIR=%{buildroot} \ - idldir=%{_datadir}/idl/%{name} \ - includedir=%{_includedir}/%{name} \ - installdir=%{_libdir}/%{name} \ - sdkdir=%{_libdir}/%{name}-devel \ - install + make -f client.mk \ + DESTDIR=%{buildroot} \ + idldir=%{_datadir}/idl/%{name} \ + includedir=%{_includedir}/%{name} \ + installdir=%{_libdir}/%{name} \ + sdkdir=%{_libdir}/%{name}-devel \ + install %endif %if 0%{?el7} -popd || : + popd || : EOF %endif @@ -160,6 +158,7 @@ EOF # Add distribution.ini # skipped +# filelist lifted straight from https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1 # get a list of files # $2 - dirlist # $3 - dir of fileslist @@ -214,5 +213,5 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc AUTHORS LICENSE %changelog -* Fri Aug 24 2018 B Stack 28.0.0-0 -- Initial rpm built. +* Wed Sep 05 2018 B Stack 28.0.0-1 +- rpm spec updated -- cgit