From 322a24950c82f569a73396b5b943bf25bd6862fe Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 21 Jan 2021 11:25:55 +0100 Subject: Updated RPM spec file to ignore non-executable files --- Installer/fedora/duplicati-binary.spec | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/Installer/fedora/duplicati-binary.spec b/Installer/fedora/duplicati-binary.spec index 9b4dc58cb..582936b02 100644 --- a/Installer/fedora/duplicati-binary.spec +++ b/Installer/fedora/duplicati-binary.spec @@ -11,6 +11,9 @@ # Then load overrides %include %{_topdir}/SOURCES/%{namer}-buildinfo.spec +# The mangler detects executable bits, but `ls` says the files are not executable... +%global __brp_mangle_shebangs_exclude_from ^(.*/(webroot|licenses)/.*)|(.*\\.(config|bat|txt|ps1|desktop))|(.*/DuplicatiVerify\\.py)$ + # Make sure it does not break because we have som arch-dependant libraries bundled %define _binaries_in_noarch_packages_terminate_build 0 @@ -108,14 +111,14 @@ rm -rf libstorj_uplink.dylib # Mono binaries are installed in /usr/lib, not /usr/lib64, even on x86_64: # https://fedoraproject.org/wiki/Packaging:Mono -install -d %{buildroot}%{_datadir}/pixmaps/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/dark/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/light/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/licenses/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/webroot/ -install -d %{buildroot}%{_exec_prefix}/lib/%{namer}/lvm-scripts/ +install -d -m 755 %{buildroot}%{_datadir}/pixmaps/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/dark/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/SVGIcons/light/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/licenses/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/webroot/ +install -d -m 755 %{buildroot}%{_exec_prefix}/lib/%{namer}/lvm-scripts/ /bin/bash %{_topdir}/SOURCES/%{namer}-install-recursive.sh "." "%{buildroot}%{_exec_prefix}/lib/%{namer}/" @@ -133,9 +136,10 @@ install -p -D -m 755 %{namer}-server-launcher.sh %{buildroot}%{_bindir}/%{namer} install -p %{namer}.png %{buildroot}%{_datadir}/pixmaps/ # And fix permissions -find "%{buildroot}%{_exec_prefix}/lib/%{namer}"/* -type f -name \*.exe | xargs chmod 755 -find "%{buildroot}%{_exec_prefix}/lib/%{namer}"/* -type f -name \*.sh | xargs chmod 755 -#find "%{buildroot}%{_exec_prefix}/lib/%{namer}"/* -type f -name \*.py | xargs chmod 755 +find "%{buildroot}%{_exec_prefix}/lib/%{namer}/" -type f | xargs chmod 644 +find "%{buildroot}%{_exec_prefix}/lib/%{namer}/" -type f -name \*.exe | xargs chmod 755 +find "%{buildroot}%{_exec_prefix}/lib/%{namer}/" -type f -name \*.sh | xargs chmod 755 +find "%{buildroot}%{_exec_prefix}/lib/%{namer}/" -type f -name \*.py | xargs chmod 755 desktop-file-install %{namer}.desktop @@ -170,6 +174,10 @@ install -p -D -m 644 %{_topdir}/SOURCES/%{namer}.default %{_sysconfdir}/sysconfi %changelog +* Thu Jan 21 2021 Kenneth Skovhede - 2.0.0-0.20210121.git +- Updated patch files +- Fixed minor build issues + * Wed Jun 21 2017 Kenneth Skovhede - 2.0.0-0.20170621.git - Added the service file to the install -- cgit v1.2.3