From 112337b89906d34721615e81586d008ead1f5177 Mon Sep 17 00:00:00 2001 From: Christopher Engelhard Date: Aug 21 2020 13:37:08 +0000 Subject: remove double / from buildroot subdirs --- diff --git a/acme-sh/acme-sh.spec b/acme-sh/acme-sh.spec index 5c351a4..be0968a 100644 --- a/acme-sh/acme-sh.spec +++ b/acme-sh/acme-sh.spec @@ -68,35 +68,35 @@ cp %{SOURCE5} README-fedora.md %install # set up directory structure -install -p -d -m 0755 %{buildroot}/%{_bindir} -install -p -d -m 0755 %{buildroot}/%{_unitdir} -install -p -d -m 0755 %{buildroot}/%{_userunitdir} -install -p -d -m 0755 %{buildroot}/%{_sysconfdir}/sysconfig -install -p -d -m 0755 %{buildroot}/%{_datadir}/%{binname}/ -install -p -d -m 0700 %{buildroot}/%{_sharedstatedir}/%{binname}/ +install -p -d -m 0755 %{buildroot}%{_bindir} +install -p -d -m 0755 %{buildroot}%{_unitdir} +install -p -d -m 0755 %{buildroot}%{_userunitdir} +install -p -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig +install -p -d -m 0755 %{buildroot}%{_datadir}/%{binname}/ +install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/%{binname}/ # install upstream files -install -p -d -m 0755 %{buildroot}/%{_datadir}/%{binname}/deploy -install -p -d -m 0755 %{buildroot}/%{_datadir}/%{binname}/dnsapi -install -p -d -m 0755 %{buildroot}/%{_datadir}/%{binname}/notify -install -p -m 0755 %{binname} %{buildroot}/%{_datadir}/%{binname}/%{binname} -install -m 0755 deploy/*.sh %{buildroot}/%{_datadir}/%{binname}/deploy -install -m 0755 dnsapi/*.sh %{buildroot}/%{_datadir}/%{binname}/dnsapi -install -m 0755 notify/*.sh %{buildroot}/%{_datadir}/%{binname}/notify +install -p -d -m 0755 %{buildroot}%{_datadir}/%{binname}/deploy +install -p -d -m 0755 %{buildroot}%{_datadir}/%{binname}/dnsapi +install -p -d -m 0755 %{buildroot}%{_datadir}/%{binname}/notify +install -p -m 0755 %{binname} %{buildroot}%{_datadir}/%{binname}/%{binname} +install -m 0755 deploy/*.sh %{buildroot}%{_datadir}/%{binname}/deploy +install -m 0755 dnsapi/*.sh %{buildroot}%{_datadir}/%{binname}/dnsapi +install -m 0755 notify/*.sh %{buildroot}%{_datadir}/%{binname}/notify # install Fedora-specific files -install -p -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/%{binname}-system -install -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{binname} -install -p -m 0644 %{SOURCE2} %{buildroot}/%{_unitdir}/%{name}.service -install -p -m 0644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.timer -install -p -m 0644 %{SOURCE2} %{buildroot}/%{_userunitdir}/%{name}.service -install -p -m 0644 %{SOURCE3} %{buildroot}/%{_userunitdir}/%{name}.timer +install -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/%{binname}-system +install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{binname} +install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.timer +install -p -m 0644 %{SOURCE2} %{buildroot}%{_userunitdir}/%{name}.service +install -p -m 0644 %{SOURCE3} %{buildroot}%{_userunitdir}/%{name}.timer # create link to executable in /usr/bin -ln -sf %{_datadir}/%{binname}/%{binname} %{buildroot}/%{_bindir}/%{binname} +ln -sf %{_datadir}/%{binname}/%{binname} %{buildroot}%{_bindir}/%{binname} # don't source /etc/sysconfig/acme.sh in user unit -sed -i '/EnvironmentFile/d' %{buildroot}/%{_userunitdir}/%{name}.service +sed -i '/EnvironmentFile/d' %{buildroot}%{_userunitdir}/%{name}.service #-- SCRIPTLETS -----------------------------------------------------------------# %post