From c01d4d2be34049cb6c62773d65f9833bcb0096ec Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jun 11 2024 14:29:36 +0000 Subject: Manual CentOS Branding --- diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index 2d29d5a..1827f8f 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -168,7 +168,6 @@ Patch1002: 1002-Package-copy-schema-to-ca.py.patch Patch1003: 1003-Revert-Increased-mod_wsgi-socket-timeout.patch Patch1004: 1004-Remove-csrgen.patch Patch1005: 1005-Removing-filesystem-encoding-check.patch -Patch1006: ipa-centos-branding.patch # RHEL spec file only: END BuildRequires: libtool, automake, autoconf @@ -420,7 +419,10 @@ 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 @@ -1003,7 +1005,8 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} + %{linter_options} \ + --with-ipaplatform=rhel %make_build @@ -1024,7 +1027,8 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} + %{linter_options} \ + --with-ipaplatform=rhel popd %endif # with_python3 @@ -1111,9 +1115,11 @@ 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}