summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-09-17 11:52:37 +0200
committerPetr Vobornik <pvoborni@redhat.com>2014-09-23 20:28:47 +0200
commit22ce015913c482308d499572bd24389bca98a0e5 (patch)
treec62353e1152ebb015ca9ba8512713e85c1b388bd
parentdf187a4b4a9a2eeac8b11152de0cdc250e55cfb1 (diff)
downloadfreeipa-22ce015913c482308d499572bd24389bca98a0e5.tar.gz
freeipa-22ce015913c482308d499572bd24389bca98a0e5.tar.xz
freeipa-22ce015913c482308d499572bd24389bca98a0e5.zip
Include the ipa command in client-only build
https://fedorahosted.org/freeipa/ticket/4536 Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
-rw-r--r--freeipa.spec.in8
-rwxr-xr-xsetup-client.py2
2 files changed, 4 insertions, 6 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index dfa81856b..63fb98113 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -223,7 +223,6 @@ logs, analysis thereof). If your network uses IPA for authentication,
this package should be installed on every client machine.
-%if ! %{ONLY_CLIENT}
%package admintools
Summary: IPA administrative tools
Group: System Environment/Base
@@ -241,7 +240,6 @@ user, virtual machines, groups, authentication credentials), Policy
(configuration settings, access control information) and Audit (events,
logs, analysis thereof). This package provides command-line tools for
IPA administrators.
-%endif # ONLY_CLIENT
%package python
Summary: Python libraries used by IPA
@@ -427,10 +425,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/ipa/
/bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
/bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
-
-%if ! %{ONLY_CLIENT}
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ipa
+
+%if ! %{ONLY_CLIENT}
mkdir -p %{buildroot}%{_sysconfdir}/cron.d
(cd %{buildroot}/%{python_sitelib}/ipaserver && find . -type f | \
@@ -770,14 +768,12 @@ fi
%{_mandir}/man1/ipa-join.1.gz
%{_mandir}/man5/default.conf.5.gz
-%if ! %{ONLY_CLIENT}
%files admintools
%defattr(-,root,root,-)
%doc COPYING README Contributors.txt
%{_bindir}/ipa
%config %{_sysconfdir}/bash_completion.d
%{_mandir}/man1/ipa.1.gz
-%endif # ONLY_CLIENT
%files python -f %{gettext_domain}.lang
%defattr(-,root,root,-)
diff --git a/setup-client.py b/setup-client.py
index a42444054..802df3217 100755
--- a/setup-client.py
+++ b/setup-client.py
@@ -35,4 +35,6 @@ setup(
'ipalib',
'ipalib.plugins',
],
+ scripts=['ipa'],
+ data_files = [('share/man/man1', ["ipa.1"])],
)