Commit fb22bd32 authored by jswaelens's avatar jswaelens

Merge branch...

Merge branch '7-lib-macro-is-not-correct-for-systemd-because-it-s-not-stored-in-lib64' into '1.2.1-fixes'

Resolve "Lib macro is not correct for systemd because it's not stored in lib64"

See merge request redhat/argonaut!16
parents 47be5679 8db2eed7
......@@ -20,4 +20,4 @@ rpmlint:
- apt-get update -qq
- apt-get install -y -qq rpmlint
script:
- rpmlint -i specs/argonaut-systemd.spec
- rpmlint -f specs/rpmlint -i specs/argonaut-systemd.spec
......@@ -208,12 +208,12 @@ cd -
rm -rf %{buildroot}
# Directories
mkdir -p %{buildroot}/%{_lib}/systemd/system/
mkdir -p %{buildroot}/lib/systemd/system/
mkdir -p %{buildroot}/%{_sbindir}/
mkdir -p %{buildroot}/%{_datadir}/perl5/
mkdir -p %{buildroot}/%{_datadir}/man1/
mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}/usr/%{_lib}/fai/
mkdir -p %{buildroot}/usr/lib/fai/
mkdir -p %{buildroot}/%{_sysconfdir}/fai/nfsroot-hooks/
mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Fuse/Modules/
mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Server/Modules/
......@@ -323,10 +323,10 @@ cp -a ./Argonaut/ %{buildroot}/%{_datadir}/perl5/
cd ..
# Copy service file
cp %{S:1} %{buildroot}/%{_lib}/systemd/system/
cp %{S:2} %{buildroot}/%{_lib}/systemd/system/
cp %{S:3} %{buildroot}/%{_lib}/systemd/system/
cp %{S:4} %{buildroot}/%{_lib}/systemd/system/
cp %{S:1} %{buildroot}/lib/systemd/system/
cp %{S:2} %{buildroot}/lib/systemd/system/
cp %{S:3} %{buildroot}/lib/systemd/system/
cp %{S:4} %{buildroot}/lib/systemd/system/
# Set the good rights
chmod +x %{buildroot}/%{_sbindir}/*
......@@ -376,7 +376,7 @@ rm -rf %{buildroot}
%{_datadir}/perl5/Argonaut/ClientDaemon/Modules/Service.pm
%{_datadir}/perl5/Argonaut/ClientDaemon/Modules/System.pm
%{_datadir}/man1/%{name}-client.1.gz
/%{_lib}/systemd/system/%{name}-client.service
/lib/systemd/system/%{name}-client.service
%files common
%defattr(-,root,root,-)
......@@ -409,7 +409,7 @@ rm -rf %{buildroot}
%{_datadir}/perl5/Argonaut/Server/ModulesPool.pm
%{_datadir}/perl5/Argonaut/Server/Modules/Argonaut.pm
%{_datadir}/man1/%{name}-server.1.gz
/%{_lib}/systemd/system/%{name}-server.service
/lib/systemd/system/%{name}-server.service
%files fuse-module-fai
%defattr(-,root,root,-)
......@@ -429,14 +429,14 @@ rm -rf %{buildroot}
%{_sysconfdir}/logrotate.d/%{name}-fuse
%{_sbindir}/%{name}-fuse
%{_datadir}/man1/argonaut-fuse.1.gz
/%{_lib}/systemd/system/%{name}-fuse.service
/lib/systemd/system/%{name}-fuse.service
%files fai-monitor
%defattr(-,root,root,-)
%doc Authors.md Changelog.md
/usr/sbin/%{name}-fai-monitor
%{_datadir}/man1/%{name}-fai-monitor.1.gz
/%{_lib}/systemd/system/%{name}-fai-monitor.service
/lib/systemd/system/%{name}-fai-monitor.service
%files yumgroup2yumi
%defattr(-,root,root,-)
......
addFilter("E: hardcoded-library-path")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment