mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-24 16:10:02 -06:00
Clean spec file for Fedora 19
This patch includes several cleanups needed for Fedora 19 build: * ipa-kdb is compatible with both krb5 1.10 and 1.11 which contains an updated DAL interface. Remove the conflict from spec file. * Fix ipa-ldap-updater call to produce errors only to avoid cluttering rpm update output * Remove httpd_conf constant which was not used https://fedorahosted.org/freeipa/ticket/3502
This commit is contained in:
parent
aa2ed2d3c8
commit
e13a437031
@ -1,10 +1,8 @@
|
||||
# Define ONLY_CLIENT to only make the ipa-client and ipa-python subpackages
|
||||
%{!?ONLY_CLIENT:%global ONLY_CLIENT 0}
|
||||
|
||||
%global httpd_conf /etc/httpd/conf.d
|
||||
%global plugin_dir %{_libdir}/dirsrv/plugins
|
||||
|
||||
%global POLICYCOREUTILSVER 1.33.12-1
|
||||
%global POLICYCOREUTILSVER 2.1.12-5
|
||||
%global gettext_domain ipa
|
||||
|
||||
Name: freeipa
|
||||
@ -39,7 +37,11 @@ BuildRequires: nspr-devel
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: openldap-devel
|
||||
%if 0%{?fedora} >= 19
|
||||
BuildRequires: krb5-devel >= 1.11
|
||||
%else
|
||||
BuildRequires: krb5-devel >= 1.10
|
||||
%endif
|
||||
BuildRequires: krb5-workstation
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libcurl-devel >= 7.21.7-2
|
||||
@ -90,8 +92,17 @@ Requires: 389-ds-base >= 1.3.0
|
||||
Requires: openldap-clients
|
||||
Requires: nss
|
||||
Requires: nss-tools
|
||||
Requires: krb5-server >= 1.10
|
||||
%if 0%{?fedora} >= 19
|
||||
Requires: krb5-server >= 1.11
|
||||
%else
|
||||
%if 0%{?fedora} == 18
|
||||
# krb5 1.11 bumped DAL interface major version, a rebuild is needed
|
||||
Requires: krb5-server < 1.11
|
||||
Requires: krb5-server >= 1.10
|
||||
%else
|
||||
Requires: krb5-server >= 1.10
|
||||
%endif
|
||||
%endif
|
||||
Requires: krb5-pkinit-openssl
|
||||
Requires: cyrus-sasl-gssapi%{?_isa}
|
||||
Requires: ntp
|
||||
@ -439,7 +450,7 @@ fi
|
||||
%posttrans server
|
||||
# This must be run in posttrans so that updates from previous
|
||||
# execution that may no longer be shipped are not applied.
|
||||
/usr/sbin/ipa-ldap-updater --upgrade --quiet || :
|
||||
/usr/sbin/ipa-ldap-updater --upgrade --quiet >/dev/null || :
|
||||
|
||||
%preun server
|
||||
if [ $1 = 0 ]; then
|
||||
@ -771,6 +782,11 @@ fi
|
||||
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
|
||||
|
||||
%changelog
|
||||
* Wed Mar 27 2013 Martin Kosek <mkosek@redhat.com> - 3.1.99-2
|
||||
- Remove conflict with krb5-server > 1.11 as ipa-kdb is compatible
|
||||
- ipa-ldap-updater show produce errors only
|
||||
- update policycoreutils version to 2.1.12-5 to match Requires in Fedora
|
||||
|
||||
* Thu Mar 21 2013 Martin Kosek <mkosek@redhat.com> - 3.1.99-1
|
||||
- Require selinux-policy 3.11.1-86 to fix Fedora 17 to 18 upgrade issue
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user