[freeipa/f16] Clean up spec and uprgade sssd dependency to 1.6.2
abbra
abbra at fedoraproject.org
Wed Oct 19 14:06:32 UTC 2011
commit 5923102e4c8194bfbf157bab82e3cef27e245656
Author: Alexander Bokovoy <abokovoy at redhat.com>
Date: Wed Oct 19 17:06:04 2011 +0300
Clean up spec and uprgade sssd dependency to 1.6.2
freeipa.spec | 104 ++++------------------------------------------------------
1 files changed, 7 insertions(+), 97 deletions(-)
---
diff --git a/freeipa.spec b/freeipa.spec
index dc6cebf..3a0cae3 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: freeipa
Version: 2.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Identity, Policy and Audit system
Group: System Environment/Base
@@ -30,10 +30,8 @@ BuildRequires: 389-ds-base-devel >= 1.2.9
BuildRequires: svrcore-devel
BuildRequires: /usr/share/selinux/devel/Makefile
BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
-%if 0%{?fedora} >= 16
BuildRequires: systemd-units
%endif
-%endif
BuildRequires: nspr-devel
BuildRequires: nss-devel
BuildRequires: openssl-devel
@@ -41,18 +39,8 @@ BuildRequires: openldap-devel
BuildRequires: krb5-devel
BuildRequires: krb5-workstation
BuildRequires: libuuid-devel
-%if 0%{?fedora} >= 16
BuildRequires: libcurl-devel >= 7.21.7-2
BuildRequires: xmlrpc-c-devel >= 1.27.4
-%else
-%if 0%{?fedora} == 15
-BuildRequires: libcurl-devel >= 7.21.3-9
-BuildRequires: xmlrpc-c-devel >= 1.25.4
-%else
-BuildRequires: libcurl-devel
-BuildRequires: xmlrpc-c-devel
-%endif
-%endif
BuildRequires: popt-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -65,11 +53,7 @@ BuildRequires: python-ldap
BuildRequires: python-setuptools
BuildRequires: python-krbV
BuildRequires: python-nss
-%if 0%{?fedora} >= 15
BuildRequires: python-netaddr >= 0.7.5-3
-%else
-BuildRequires: python-netaddr
-%endif
BuildRequires: python-kerberos
BuildRequires: python-rhsm
BuildRequires: pyOpenSSL
@@ -94,11 +78,7 @@ Requires(pre): 389-ds-base >= 1.2.10-0.4.a4
Requires: openldap-clients
Requires: nss
Requires: nss-tools
-%if 0%{?fedora} >= 16
Requires: krb5-server >= 1.9.1-15
-%else
-Requires: krb5-server
-%endif
Requires: krb5-server-ldap
Requires: krb5-pkinit-openssl
Requires: cyrus-sasl-gssapi%{?_isa}
@@ -111,45 +91,23 @@ Requires: python-ldap
Requires: python-krbV
Requires: acl
Requires: python-pyasn1 >= 0.0.9a
-%if 0%{?fedora} >= 16
Requires: systemd-units >= 36-3
Requires(pre): systemd-units
Requires(post): systemd-units
-%endif
-%if 0%{?fedora} >= 15
-Requires: selinux-policy >= 3.9.16-18
-%else
-Requires: selinux-policy >= 3.9.7-27
-%endif
+Requires: selinux-policy >= 3.10.0-31
Requires(post): selinux-policy-base
Requires: slapi-nis >= 0.21
-%if 0%{?fedora} >= 16
Requires: pki-ca >= 9.0.15
Requires: pki-silent >= 9.0.15
# Only tomcat6 greater than this version provides proper systemd support
Requires: tomcat6 >= 6.0.32-17
-%else
-%if 0%{?fedora} >= 15
-Requires: pki-ca >= 9.0.15
-Requires: pki-silent >= 9.0.15
-Requires: pki-setup >= 9.0.15
-%else
-Requires: pki-ca >= 9.0.5
-Requires: pki-silent >= 9.0.5
-%endif
-%endif
Requires: dogtag-pki-common-theme
Requires: dogtag-pki-ca-theme
%if 0%{?rhel}
Requires: subscription-manager
%endif
-%if 0%{?fedora} >= 16
Requires(preun): python systemd-units
Requires(postun): python systemd-units
-%else
-Requires(preun): python initscripts chkconfig
-Requires(postun): python initscripts chkconfig
-%endif
# We have a soft-requires on bind. It is an optional part of
# IPA but if it is configured we need a way to require versions
@@ -197,19 +155,9 @@ Requires: krb5-workstation
Requires: authconfig
Requires: pam_krb5
Requires: wget
-%if 0%{?fedora} >= 16
Requires: libcurl >= 7.21.7-2
Requires: xmlrpc-c >= 1.27.4
-%else
-%if 0%{?fedora} == 15
-Requires: libcurl >= 7.21.3-9
-Requires: xmlrpc-c >= 1.25.4
-%else
-Requires: libcurl
-Requires: xmlrpc-c
-%endif
-%endif
-Requires: sssd >= 1.5.1
+Requires: sssd >= 1.6.2
Requires: certmonger >= 0.26
Requires: nss-tools
Requires: bind-utils
@@ -246,20 +194,14 @@ IPA administrators.
%package python
Summary: Python libraries used by IPA
Group: System Environment/Libraries
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
Requires: python-kerberos >= 1.1-3
-%endif
Requires: authconfig
Requires: gnupg
Requires: iproute
Requires: pyOpenSSL
Requires: python-nss >= 0.11
Requires: python-lxml
-%if 0%{?fedora} >= 15
Requires: python-netaddr >= 0.7.5-3
-%else
-Requires: python-netaddr
-%endif
Requires: libipa_hbac-python
Obsoletes: ipa-python >= 1.0
@@ -280,11 +222,9 @@ package.
%build
export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}"
-%if 0%{?fedora} >= 16
export SUPPORTED_PLATFORM=fedora16
# Force re-generate of platform support
rm -f ipapython/services.py
-%endif
make version-update
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%if ! %{ONLY_CLIENT}
@@ -304,11 +244,9 @@ make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client
%install
rm -rf %{buildroot}
%if ! %{ONLY_CLIENT}
-%if 0%{?fedora} >= 16
export SUPPORTED_PLATFORM=fedora16
# Force re-generate of platform support
rm -f ipapython/services.py
-%endif
make install DESTDIR=%{buildroot}
cd selinux
make install DESTDIR=%{buildroot}
@@ -351,16 +289,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa.conf
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
-%if 0%{?fedora} >= 16
# Default to systemd initscripts for F16 and above
mkdir -p %{buildroot}%{_unitdir}
for i in ipa.service ipa_kpasswd.service ; do
install -m 644 init/systemd/$i %{buildroot}%{_unitdir}/$i
done
rm -f %{buildroot}%{_initrddir}/ipa_kpasswd
-%else
-install -m755 init/SystemV/ipa.init %{buildroot}%{_initrddir}/ipa
-%endif
%endif
mkdir -p %{buildroot}%{_sysconfdir}/ipa/
@@ -379,16 +313,8 @@ rm -rf %{buildroot}
%if ! %{ONLY_CLIENT}
%post server
-%if 0%{?fedora} >= 16
# Use systemd scheme, update systemd as service units have changed
/bin/systemctl --system daemon-reload 2>&1 || :
-%endif
-%if 0%{?fedora} < 16
-if [ $1 = 1 ]; then
- /sbin/chkconfig --add ipa
- /sbin/chkconfig --add ipa_kpasswd
-fi
-%endif
if [ $1 -gt 1 ] ; then
/usr/sbin/ipa-upgradeconfig || :
/usr/sbin/ipa-ldap-updater --upgrade >/dev/null 2>&1 || :
@@ -396,28 +322,16 @@ fi
%preun server
if [ $1 = 0 ]; then
-%if 0%{?fedora} >= 16
# Use systemd scheme
/bin/systemctl --quiet stop ipa.service || :
/bin/systemctl --quiet disable ipa.service || :
-%else
-# Use SystemV scheme only before F16
- /sbin/chkconfig --del ipa
- /sbin/chkconfig --del ipa_kpasswd
- /sbin/service ipa stop >/dev/null 2>&1 || :
-%endif
fi
%postun server
if [ "$1" -ge "1" ]; then
-%if 0%{?fedora} >= 16
# Use systemd scheme
/bin/systemctl --quiet is-active ipa.service >/dev/null && \
/bin/systemctl try-restart ipa.service >/dev/null 2>&1 || :
-%else
-# Use SystemV scheme only before F16
- /sbin/service ipa condrestart >/dev/null 2>&1 || :
-%endif
fi
%pre server-selinux
@@ -486,15 +400,9 @@ fi
%{_sbindir}/ipa-upgradeconfig
%{_sbindir}/ipa-compliance
%{_sysconfdir}/cron.d/ipa-compliance
-%if 0%{?fedora} >= 16
# Use systemd scheme
%attr(644,root,root) %{_unitdir}/ipa.service
%attr(644,root,root) %{_unitdir}/ipa_kpasswd.service
-%else
-# Use SystemV scheme only before F16
-%attr(755,root,root) %{_initrddir}/ipa
-%attr(755,root,root) %{_initrddir}/ipa_kpasswd
-%endif
%dir %{python_sitelib}/ipaserver
%{python_sitelib}/ipaserver/*
%dir %{_usr}/share/ipa
@@ -617,14 +525,16 @@ fi
%dir %{python_sitelib}/ipalib
%{python_sitelib}/ipalib/*
%{python_sitearch}/default_encoding_utf8.so
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%{python_sitelib}/ipapython-*.egg-info
%{python_sitelib}/freeipa-*.egg-info
%{python_sitearch}/python_default_encoding-*.egg-info
-%endif
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
%changelog
+* Wed Oct 19 2011 Alexander Bokovoy <abokovoy at redhat.com> - 2.1.3-4
+- clean up spec
+- Depend on sssd >= 1.6.2 for better user experience
+
* Tue Oct 18 2011 Alexander Bokovoy <abokovoy at redhat.com> - 2.1.3-3
- Fix Fedora package changelog after merging systemd changes
More information about the scm-commits
mailing list