From 272b1f217d58ed4235dceb4c38592b3cadd8b0db Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Oct 18 2019 16:15:47 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index f3c4a2d..c8c75ab 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -183,7 +183,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 @@ -432,7 +431,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 @@ -1008,7 +1010,8 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} + %{linter_options} \ + --with-ipaplatform=rhel %make_build @@ -1029,7 +1032,8 @@ find \ %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ - %{linter_options} + %{linter_options} \ + --with-ipaplatform=rhel popd %endif # with_python3 @@ -1108,9 +1112,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}