From 274ae43ad62bf0f6e6c5758e58609d9e7e4107df Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 27 Mar 2019 11:22:33 -0400 Subject: palemoon 28.4.1 rpm rc1 fixes #3 palemoon customization --- palemoon/palemoon.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'palemoon/palemoon.spec') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index a0b97f5..05aca70 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -35,7 +35,7 @@ Summary: Pale Moon web browser with stackrpms prefs Name: palemoon Summary: Pale Moon web browser %endif -Version: 28.4.0 +Version: 28.4.1 Release: 1 Group: Networking/Web @@ -46,8 +46,9 @@ Source1: palemoon-mozconfig Source2: palemoon.desktop Source3: palemoon-mimeinfo.xml %if 0%{stackrpms_custom} -Source4: bgstack15-prefs.js +Source4: bgstack15-palemoon-prefs.js Patch0: small-icons.patch +Patch1: bgstack15-palemoon.patch %endif Packager: Bgstack15 @@ -103,6 +104,7 @@ and themes to make the browser truly your own. %if 0%{stackrpms_custom} %patch0 -p1 +%patch1 -p1 %endif %build -- cgit From 6ed122483a1e350b0aeb7907f82c9d43e6c0156a Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 28 Mar 2019 20:12:39 -0400 Subject: suppress binary stripping on el6 The official release does not suffer from this, but for some reason the stackrpms release of palemoon fails the binary stripping at the end with messages similar to: + /usr/lib/rpm/check-buildroot + /usr/lib/rpm/redhat/brp-compress + /usr/lib/rpm/redhat/brp-strip /usr/bin/strip + /usr/lib/rpm/redhat/brp-strip-static-archive /usr/bin/strip BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libxpcomglue.a(PLDHashTable.o): invalid relocation type 42 /usr/bin/strip: PLDHashTable.o: Bad value BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libxpcomglue_s.a(Unified_cpp_xpcom_glue0.o): invalid relocation type 42 /usr/bin/strip: Unified_cpp_xpcom_glue0.o: Bad value BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libmozglue.a(SSE.o): invalid relocation type 42 /usr/bin/strip: SSE.o: Bad value BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libmemory.a(jemalloc_config.o): invalid relocation type 42 /usr/bin/strip: jemalloc_config.o: Bad value BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libunicharutil_external_s.a(chariter.o): invalid relocation type 42 /usr/bin/strip: chariter.o: Bad value BFD: /builddir/build/BUILDROOT/palemoon-stackrpms-28.4.1-1.x86_64/usr/lib64/palemoon-stackrpms-devel/sdk/lib/libcrmf.a(crmfenc.o): invalid relocation type 42 /usr/bin/strip: crmfenc.o: Bad value error: Bad exit status from /var/tmp/rpm-tmp.pudIld (%install) --- palemoon/palemoon.spec | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'palemoon/palemoon.spec') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 05aca70..2b00195 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -27,6 +27,11 @@ %define scl_buildreq devtoolset-7-toolchain %endif +# suppress binary strippping on el6 which fails for some reason +%if 0%{?el6} + %global __os_install_post %{nil} +%endif + %if 0%{stackrpms_custom} Name: palemoon-stackrpms Summary: Pale Moon web browser with stackrpms prefs -- cgit From a5ac6b1d868be7d023f8ee327c7b8220d73b297e Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 28 Mar 2019 20:22:32 -0400 Subject: WIP: remove unneeded directories for binary package The dpkg cleans up /usr/share/idl, /usr/lib/palemoon-devel, and /usr/include, and the rpm will try that too. --- palemoon/palemoon.spec | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'palemoon/palemoon.spec') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 2b00195..7de11a1 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -142,6 +142,11 @@ rm -rf %{buildroot} installdir=%{_libdir}/%{name} \ sdkdir=%{_libdir}/%{name}-devel \ install + rm -rf %{buildroot}%{_datadir}/idl \ + %{buildroot}%{_libdir}/%{name}-devel \ + %{buildroot}%{_includedir} || : + # remove vestigial duplicate file + rm -rf %{buildroot}%{_libdir}/%{name}/%{appname}-bin || : %endif %if "%{?scl_env}" != "" popd || : -- cgit