diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index fb0f03f..6389c08 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -51,11 +51,12 @@ %global selinux_policy_version 3.13.1-224 %global slapi_nis_version 0.56.0-4 %global python2_ldap_version 2.4.15 -# 10.5.9-5: https://bugzilla.redhat.com/show_bug.cgi?id=1596629 -%global pki_version 10.5.9-5 -# Fix for "Installation fails: Replica Busy" -# https://bugzilla.redhat.com/show_bug.cgi?id=1598478 -%global ds_version 1.3.8.4-15 +# The ds and pki versions need to be synchronized +# 1959349 - Need to bump pki + ds version +# 10.5.18-13: https://bugzilla.redhat.com/show_bug.cgi?id=1949136 +%global pki_version 10.5.18-13 +# 1.3.10.2-12: https://bugzilla.redhat.com/show_bug.cgi?id=1931182 +%global ds_version 1.3.10.2-12 %else # 1.15.1-7: certauth (http://krbdev.mit.edu/rt/Ticket/Display.html?id=8561) %global krb5_version 1.15.1-7 @@ -102,7 +103,7 @@ Name: ipa Version: %{IPA_VERSION} -Release: 5%{?dist}.5 +Release: 5%{?dist}.6 Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -110,9 +111,9 @@ License: GPLv3+ URL: http://www.freeipa.org/ Source0: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz # RHEL spec file only: START: Change branding to IPA and Identity Management -#Source1: header-logo.png -#Source2: login-screen-background.jpg -#Source4: product-name.png +Source1: header-logo.png +Source2: login-screen-background.jpg +Source4: product-name.png # RHEL spec file only: END: Change branding to IPA and Identity Management BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -401,10 +402,7 @@ Requires: oddjob Requires: gssproxy >= 0.7.0-2 # 1.15.2: FindByNameAndCertificate (https://pagure.io/SSSD/sssd/issue/3050) Requires: sssd-dbus >= 1.15.2 - -%if 0%{?centos} == 0 Requires: system-logos >= 70.7.0 -%endif Provides: %{alt_name}-server = %{version} Conflicts: %{alt_name}-server @@ -961,9 +959,9 @@ cp -r %{_builddir}/freeipa-%{version} %{_builddir}/freeipa-%{version}-python3 # with_python3 # RHEL spec file only: START: Change branding to IPA and Identity Management -#cp %SOURCE1 install/ui/images/header-logo.png -#cp %SOURCE2 install/ui/images/login-screen-background.jpg -#cp %SOURCE4 install/ui/images/product-name.png +cp %SOURCE1 install/ui/images/header-logo.png +cp %SOURCE2 install/ui/images/login-screen-background.jpg +cp %SOURCE4 install/ui/images/product-name.png # RHEL spec file only: END: Change branding to IPA and Identity Management @@ -987,8 +985,7 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} \ - --with-ipaplatform=rhel + %{linter_options} %make_build @@ -1009,8 +1006,7 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} \ - --with-ipaplatform=rhel + %{linter_options} popd %endif # with_python3 @@ -1097,11 +1093,9 @@ ln -s %{_bindir}/ipa-test-task-%{python2_version} %{buildroot}%{_bindir}/ipa-tes # remove files which are useful only for make uninstall find %{buildroot} -wholename '*/site-packages/*/install_files.txt' -exec rm {} \; -%if 0%{?centos} == 0 # RHEL spec file only: START: Replace login-screen-logo.png with a symlink ln -sf %{_datadir}/pixmaps/fedora-gdm-logo.png %{buildroot}%{_usr}/share/ipa/ui/images/login-screen-logo.png # RHEL spec file only: END: Replace login-screen-logo.png with a symlink -%endif %find_lang %{gettext_domain} @@ -1758,8 +1752,8 @@ fi %changelog -* Tue Apr 27 2021 CentOS Sources - 4.6.8-5.el7.centos.5 -- Roll in CentOS Branding +* Tue May 11 2021 Florence Blanc-Renaud - 4.6.8-5.el7_9.6 +- Resolves: #1959349 - Need to bump pki + ds version * Tue Apr 6 2021 Florence Blanc-Renaud - 4.6.8-5.el7_9.5 - Resolves: #1931405 krb5kdc crash - Segmentation fault in ldap_first_entry().