diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 53bc1bb..a7846b4 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -22,6 +22,8 @@ %global gtk3 1 %endif +%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) + %if 0%{?rhel} == 6 || 0%{?suse_version} %global use_initial_setup 0 %global use_firstboot 1 @@ -113,6 +115,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # nesting is required since RPM requires the various preamble directives to be # at the start of a line making meaningful indentation impossible. +Patch999: subscription-manager-1.19.21-centos-remove-redhat.repo.patch + Requires: python-ethtool Requires: python-iniparse Requires: python-decorator @@ -389,6 +393,8 @@ Subscription Manager Cockpit UI %prep %setup -q +%patch999 -p1 + %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" %{?gtk_version} @@ -418,8 +424,8 @@ make -f Makefile install VERSION=%{version}-%{release} \ %suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager %endif -desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop -desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop +#desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +#desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop %find_lang rhsm %find_lang %{name} --with-gnome @@ -438,13 +444,22 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; %{__mkdir_p} %{buildroot}%{_sysconfdir}/pki/entitlement # Setup cert directories for the container plugin: +%if 0%{!?if_centos} %{__mkdir_p} %{buildroot}%{_sysconfdir}/docker/certs.d/ %{__mkdir} %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt +%else +rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem +%endif +%if 0%{!?if_centos} %{__mkdir_p} %{buildroot}%{_sysconfdir}/etc/rhsm/ca install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem +%else +rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem +rm %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem +%endif %if %use_cockpit # install cockpit dist targz @@ -676,7 +691,7 @@ rm -rf %{buildroot} %{python_sitearch}/subscription_manager/gui/data/glade/*.glade %{python_sitearch}/subscription_manager/gui/data/icons/*.svg -%{_datadir}/applications/subscription-manager-gui.desktop +#%{_datadir}/applications/subscription-manager-gui.desktop %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png %{_datadir}/icons/hicolor/24x24/apps/*.png @@ -688,7 +703,7 @@ rm -rf %{buildroot} %{_datadir}/appdata/subscription-manager-gui.appdata.xml # gui system config files -%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +#%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %if !0%{?suse_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui @@ -728,9 +743,9 @@ rm -rf %{buildroot} %{python_sitearch}/subscription_manager/plugin/container.py* # Copying Red Hat CA cert into each directory: -%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com -%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt +#%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com +#%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem +#%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %if %has_ostree @@ -880,6 +895,9 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Apr 12 2018 Johnny Hughes 1.20.11-1 +- Manual CentOS Debranding + * Tue Mar 13 2018 Christopher Snyder 1.20.11-1 - 1554482: Reenable RHUI support (csnyder@redhat.com)