summaryrefslogtreecommitdiff
path: root/palemoon
diff options
context:
space:
mode:
Diffstat (limited to 'palemoon')
-rw-r--r--palemoon/palemoon.spec47
1 files 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 <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
bgstack15