diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-12-09 08:17:07 +0100 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-12-11 18:44:13 +0100 |
| commit | 00f591d4e93cfe1f6f020a1c708a3d90b5b34288 (patch) | |
| tree | 11fdf5ddaf33a91adf617b31d68e12ab8bb77d26 | |
| parent | 12e7f71600e62eab9d48a13fba37d2f182c8bdee (diff) | |
build: put oddjob scripts into separate directory
https://fedorahosted.org/freeipa/ticket/5497
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Tomas Babej <tbabej@redhat.com>
| -rw-r--r-- | freeipa.spec.in | 4 | ||||
| -rw-r--r-- | install/oddjob/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index aceb076b5..cc4c12214 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -585,6 +585,9 @@ make client-install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_usr}/share/ipa %if ! %{ONLY_CLIENT} +# FIXME: https://bugzilla.redhat.com/show_bug.cgi?id=1289930 +mv %{buildroot}%{_libexecdir}/ipa/oddjob/com.redhat.idm.trust-fetch-domains %{buildroot}%{_libexecdir}/ipa/com.redhat.idm.trust-fetch-domains + # Remove .la files from libtool - we don't want to package # these files rm %{buildroot}/%{plugin_dir}/libipa_pwd_extop.la @@ -905,6 +908,7 @@ fi %{_libexecdir}/ipa/ipa-dnskeysync-replica %{_libexecdir}/ipa/ipa-ods-exporter %{_libexecdir}/ipa/ipa-httpd-kdcproxy +%dir %{_libexecdir}/ipa/oddjob %dir %{_libdir}/ipa/certmonger %attr(755,root,root) %{_libdir}/ipa/certmonger/* # NOTE: systemd specific section diff --git a/install/oddjob/Makefile.am b/install/oddjob/Makefile.am index 9dde10c70..5cdaf2b29 100644 --- a/install/oddjob/Makefile.am +++ b/install/oddjob/Makefile.am @@ -1,6 +1,6 @@ NULL = -oddjobdir = $(libexecdir)/ipa +oddjobdir = $(libexecdir)/ipa/oddjob oddjobconfdir = $(sysconfdir)/oddjobd.conf.d dbusconfdir = $(sysconfdir)/dbus-1/system.d |