diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-07 07:59:55 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-07 07:59:55 -0400 |
| commit | d46288b92d2d235b8f438115658099e0a444c876 (patch) | |
| tree | ba73b75d7fb269311e16176a79030aa3569cf2fc /palemoon | |
| parent | openssl110: add buildrequires: perl (diff) | |
| parent | fix comments and %if statements (diff) | |
| download | stackrpms-d46288b92d2d235b8f438115658099e0a444c876.tar.gz stackrpms-d46288b92d2d235b8f438115658099e0a444c876.tar.bz2 stackrpms-d46288b92d2d235b8f438115658099e0a444c876.zip | |
Merge branch 'fix-pm-el7'
add the %if{?el7} logic so we can compile on centos 7
Diffstat (limited to 'palemoon')
| -rw-r--r-- | palemoon/palemoon.spec | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index df52b72..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,7 +24,8 @@ BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: gcc %if 0%{?el7} -BuildRequires: gcc49 +# from repo sclo or scl-rh +BuildRequires: devtoolset-7-toolchain %endif BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -60,27 +61,41 @@ and themes to make the browser truly your own. %{__cp} %{SOURCE1} ./.mozconfig %build +# when version < 28.0.0 it needed gcc 4.9 +#source /usr/bin/gcc49 %if 0%{?el7} -source /usr/bin/gcc49 + thispwd=$( pwd ) + scl enable devtoolset-7 /bin/bash << EOF + pushd $thispwd %endif %if !%{dummy_package} -./mach build + ./mach build %endif - -%install %if 0%{?el7} -source /usr/bin/gcc49 + popd || : +EOF %endif + +%install 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} \ - 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 || : +EOF %endif # cleanup @@ -143,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 @@ -197,5 +213,5 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc AUTHORS LICENSE %changelog -* Fri Aug 24 2018 B Stack <bgstack15@gmail.com> 28.0.0-0 -- Initial rpm built. +* Wed Sep 05 2018 B Stack <bgstack15@gmail.com> 28.0.0-1 +- rpm spec updated |