Avoid uninstalling dependencies during package lifetime

Requires(pre) only guarantees that package will be present before
package scriptlets are run. However, the package can be removed
after installation is finished without removing also IPA. Add
standard Requires for these dependencies.

Remove PRE version number from VERSION. This update and following
is done on a top of IPA 3.0.0 GA.

https://fedorahosted.org/freeipa/ticket/3189
This commit is contained in:
Martin Kosek 2012-10-24 12:35:36 +02:00 committed by Rob Crittenden
parent 5e79743a0b
commit 1ed8ba6a75
2 changed files with 8 additions and 3 deletions

View File

@ -20,7 +20,7 @@
########################################################
IPA_VERSION_MAJOR=3
IPA_VERSION_MINOR=0
IPA_VERSION_RELEASE=0
IPA_VERSION_RELEASE=99
########################################################
# For 'pre' releases the version will be #
@ -30,7 +30,7 @@ IPA_VERSION_RELEASE=0
# e.g. IPA_VERSION_PRE_RELEASE=1 #
# -> "1.0.0pre1" #
########################################################
IPA_VERSION_PRE_RELEASE=2
IPA_VERSION_PRE_RELEASE=
########################################################
# For 'rc' releases the version will be #

View File

@ -106,7 +106,7 @@ Requires: %{name}-python = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
Requires: %{name}-admintools = %{version}-%{release}
Requires: %{name}-server-selinux = %{version}-%{release}
Requires(pre): 389-ds-base >= 1.2.11.14-1
Requires: 389-ds-base >= 1.2.11.14-1
Requires: openldap-clients
Requires: nss
Requires: nss-tools
@ -175,6 +175,7 @@ Requires(postun): python initscripts chkconfig
Requires: python-dns
Requires: keyutils
Requires: zip
Requires: policycoreutils >= %{POLICYCOREUTILSVER}
# 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
@ -815,6 +816,10 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog
* Wed Oct 24 2012 Martin Kosek <mkosek@redhat.com> - 3.0.99-1
- Add strict Requires for 389-ds-base and policycoreutils to avoid user
removing them during package lifetime
* Wed Oct 17 2012 Martin Kosek <mkosek@redhat.com> - 2.99.0-51
- Print ipa-upgradeconfig errors during RPM update