Commit 3c345510 authored by jswaelens's avatar jswaelens

Merge branch '14-missing-some-dependences-for-argonaut-fusiondirectory' into '1.4-dev'

Resolve "Missing some dependences for argonaut-fusiondirectory"

Closes #14

See merge request redhat/argonaut!28
parents 0211b9e2 3ab07aab
......@@ -36,7 +36,7 @@ Argonaut client to manage computers and services.
%package common
Summary: Argonaut common functions and librairies
Requires: coreutils >= 6.10-1, openldap-clients, perl-JSON >= 2.07-1, perl-JSON-RPC
Requires: perl-IO-Socket-SSL, perl-Path-Class, perl-LDAP, perl-Digest-SHA, perl-Module-Pluggable, perl-XML-SAX, perl-LWP-Protocol-https
Requires: perl-IO-Socket-SSL, perl-Path-Class, perl-LDAP, perl-Digest-SHA, perl-Module-Pluggable, perl-XML-SAX, perl-LWP-Protocol-https, perl-DateTime
%description common
Common perl libraries used by the Argonaut deployment system.
......@@ -47,6 +47,14 @@ Requires: perl-LDAP, perl-Path-Class
%description common-fai
Library for FAI (Fully Automated install) used by the Argonaut deployment system.
%package common-webservice
Summary: Argonaut common library for webservice
Requires: coreutils >= 6.10-1, %{name}-common
Requires: perl-REST-Client
%description common-webservice
Library for FusionDirectory Webservice used by the Argonaut deployment system.
%package dovecot
Summary: Argonaut client-module for dovecot
%description dovecot
......@@ -147,7 +155,7 @@ Grab data from fusioniventory and create a proper ldap schema
%package fusiondirectory
Summary: Scripts that goes with plugins in Fusiondirectory
Requires: %{name}-common, perl-Mail-Sendmail
Requires: %{name}-common, %{name}-common-webservice, perl-Mail-Sendmail
%description fusiondirectory
Contains scripts to clean audit from audit plugin and run the user reminder tasks.
......@@ -251,6 +259,10 @@ cp ./%{name}.conf %{buildroot}/%{_sysconfdir}/%{name}/
# Install argonaut-common-fai
cp ./Argonaut/Libraries/FAI.pm %{buildroot}/%{_datadir}/perl5/Argonaut/Libraries/
# Install argonaut-common-webservice
cp ./Argonaut/Libraries/FusionDirectoryWebService.pm %{buildroot}/%{_datadir}/perl5/Argonaut/Libraries/
cd ..
# Install argonaut-dovecot
......@@ -313,6 +325,7 @@ cd ..
# Install argonaut-fusiondirectory
cd ./%{name}-fusiondirectory
cp ./bin/* %{buildroot}/%{_sbindir}/
cp -a ./Argonaut/ %{buildroot}/%{_datadir}/perl5/
cp ./man/%{name}-clean-audit.1.gz %{buildroot}/%{_datadir}/man1/
cp ./man/%{name}-user-reminder.1.gz %{buildroot}/%{_datadir}/man1/
cd ..
......@@ -464,9 +477,15 @@ rm -rf %{buildroot}
%doc Authors.md Changelog
%{_datadir}/perl5/Argonaut/Libraries/FAI.pm
%files common-webservice
%defattr(-,root,root,-)
%doc Authors.md Changelog
%{_datadir}/perl5/Argonaut/Libraries/FusionDirectoryWebService.pm
%files fusiondirectory
%defattr(-,root,root,-)
%doc Authors.md Changelog
%{_datadir}/perl5/Argonaut/Libraries/WorkflowUpdate.pm
%{_datadir}/man1/%{name}-clean-audit.1.gz
%{_datadir}/man1/%{name}-user-reminder.1.gz
%{_sbindir}/%{name}-clean-audit
......
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