From c6c1e1d9761d8f7c9d8af49fb53f21c3a3ea4be1 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mkosek@redhat.com>
Date: Thu, 20 Dec 2012 10:33:39 +0100
Subject: [PATCH] Backport additional spec fixes from upstream

- Remove redundat Requires versions that are already in Fedora 17
- Replace python-crypto Requires with m2crypto
- Add missing Requires(post) for client and server-trust-ad subpackages
- Restart httpd service when server-trust-ad subpackage is installed
- Bump selinux-policy Requires to pick up PKI/LDAP port labeling fixes
---
 freeipa.spec | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/freeipa.spec b/freeipa.spec
index 67bfb8a..89e5f81 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -15,7 +15,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           freeipa
 Version:        3.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -98,17 +98,17 @@ Requires: ntp
 Requires: httpd
 Requires: mod_wsgi
 Requires: mod_auth_kerb >= 5.4-16
-Requires: mod_nss >= 1.0.8-10
+Requires: mod_nss
 Requires: python-ldap
 Requires: python-krbV
 Requires: acl
-Requires: python-pyasn1 >= 0.0.9a
+Requires: python-pyasn1
 Requires: memcached
 Requires: python-memcached
 Requires: systemd-units >= 36-3
 Requires(pre): systemd-units
 Requires(post): systemd-units
-Requires: selinux-policy >= 3.11.1-60
+Requires: selinux-policy >= 3.11.1-61
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.44
 Requires: pki-ca >= 10.0.0-1
@@ -165,7 +165,7 @@ daemons included in freeipa-server
 Summary: Virtual package to install packages required for Active Directory trusts
 Group: System Environment/Base
 Requires: %{name}-server = %version-%release
-Requires: python-crypto
+Requires: m2crypto
 Requires: samba-python
 Requires: samba >= 4.0.0-153
 Requires: samba-winbind
@@ -175,6 +175,7 @@ Requires: libsss_idmap
 # IPA AD trusts cannot be used at the same time with the locator plugin
 # since Winbindd will be configured in a different mode
 Requires(post): %{_sbindir}/update-alternatives
+Requires(post): python
 Requires(postun): %{_sbindir}/update-alternatives
 Requires(preun): %{_sbindir}/update-alternatives
 
@@ -228,6 +229,7 @@ Requires: libsss_autofs
 Requires: autofs
 Requires: libnfsidmap
 Requires: nfs-utils
+Requires(post): policycoreutils
 
 Obsoletes: ipa-client >= 1.0
 
@@ -261,11 +263,11 @@ IPA administrators.
 %package python
 Summary: Python libraries used by IPA
 Group: System Environment/Libraries
-Requires: python-kerberos >= 1.1-3
+Requires: python-kerberos
 Requires: gnupg
 Requires: iproute
 Requires: pyOpenSSL
-Requires: python-nss >= 0.11
+Requires: python-nss
 Requires: python-lxml
 Requires: python-netaddr
 Requires: libipa_hbac-python
@@ -520,6 +522,10 @@ fi
 %post server-trust-ad
 %{_sbindir}/update-alternatives --install %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so \
 				winbind_krb5_locator.so /dev/null 90
+python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
+if [  $? -eq 0 ]; then
+    /bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :
+fi
 
 %preun server-trust-ad
 if [ $1 -eq 0 ]; then
@@ -756,6 +762,13 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Thu Dec 20 2012 Martin Kosek <mkosek@redhat.com> - 3.1.0-2
+- Remove redundat Requires versions that are already in Fedora 17
+- Replace python-crypto Requires with m2crypto
+- Add missing Requires(post) for client and server-trust-ad subpackages
+- Restart httpd service when server-trust-ad subpackage is installed
+- Bump selinux-policy Requires to pick up PKI/LDAP port labeling fixes
+
 * Mon Dec 10 2012 Rob Crittenden <rcritten@redhat.com> - 3.1.0-1
 - Updated to upstream 3.1.0 GA
 - Set minimum for sssd to 1.9.2