diff --git a/.cockpit.metadata b/.cockpit.metadata index cd8a893..9ebd115 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1,2 @@ -c294c73d859a9cb1eaba67e9b06da2936a72babb SOURCES/cockpit-272.tar.xz +78c4ad32f25fa609f2b5073ab3c5bd3806b8a10a SOURCES/cockpit-273.tar.xz +a37e1d6ad4b1b25729682c54ab7e4dcdcfd894a7 SOURCES/cockpit.css.gz diff --git a/.gitignore b/.gitignore index eb103e1..8341c60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/cockpit-272.tar.xz +SOURCES/cockpit-273.tar.xz +SOURCES/cockpit.css.gz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index dacf10d..5e3fe5d 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -49,16 +49,16 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Version: 272 +Version: 273 Release: 2%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz +Source1: cockpit.css.gz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR nor packit c8s builds, only to our own # image-prepare rhel-8-Y builds (which will disable build_all). # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream -%define build_all 1 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} %if "%{name}" == "cockpit" @@ -182,23 +182,14 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ -# only ship deprecated PatternFly API for stable releases -%if 0%{?rhel} == 8 - if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then - ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz - elif [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css ]; then - ln -s cockpit.css %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css - else - echo >&2 Neither cockpit.css.gz nor cockpit.css exists. - exit 1 - fi -%endif +# RHEL 8 specific backwards compat API +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/cockpit/base1/ +ln -s cockpit.css.gz %{buildroot}%{_datadir}/cockpit/base1/patternfly.css.gz # Build the package lists for resource packages # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory echo '%dir %{_datadir}/cockpit' > base.list echo '%dir %{_datadir}/cockpit/base1' >> base.list -echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list @@ -676,6 +667,15 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Thu Jul 21 2022 Martin Pitt - 273-2 +- Re-disable BaseOS package builds + +* Thu Jul 21 2022 Martin Pitt - 273-1 + - Metrics: Display CPU temperature + - Networking: Suggest netmask and gateway addresses + - Software Updates: Optionally reboot after updating + - cockpit/ws container: Support modern SSH keys + * Wed Jun 29 2022 Martin Pitt - 272-2 - No-change rebuild due to brew confusion @@ -713,7 +713,7 @@ via PackageKit. * Tue Jan 25 2022 Matej Marusak - 261-1 - shell: Allow adding keys with passphrase -* Fri Jan 04 2022 Martin Pitt - 260-1 +* Tue Jan 04 2022 Martin Pitt - 260-1 - Certificate login validation (rhbz#1992620, CVE-2021-3698) - Client: Show previously used hosts - Client: Support port specification @@ -758,7 +758,7 @@ via PackageKit. - Polish of the Services page - Updated translations -* Mon May 12 2021 Katerina Koukiou - 244.1-1 +* Wed May 12 2021 Katerina Koukiou - 244.1-1 - Shell: sudo is invoked only when explicitly requested - Dynamically manage motd/issue symlinks in package scripts (rhbz#1876848)