diff --git a/cockpit-285.tar.xz b/cockpit-309.tar.xz similarity index 58% rename from cockpit-285.tar.xz rename to cockpit-309.tar.xz index 27a0bfb..0ed315e 100644 Binary files a/cockpit-285.tar.xz and b/cockpit-309.tar.xz differ diff --git a/cockpit.spec b/cockpit.spec index 83dee51..50d7a97 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -9,8 +9,8 @@ %bcond_with pcp Name: cockpit -Version: 285 -Release: 2 +Version: 309 +Release: 1 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ @@ -29,6 +29,7 @@ BuildRequires: autoconf automake python3 intltool libssh-devel >= 0.7.1 openssl BuildRequires: libxslt-devel docbook-style-xsl glib-networking sed glib2-devel >= 2.50.0 BuildRequires: systemd-devel krb5-server xmlto gnutls-devel >= 3.6.0 BuildRequires: gettext >= 0.21 openssh-clients gdb +BuildRequires: python3-pip %if %{with pcp} BuildRequires: pcp-libs-devel %endif @@ -96,17 +97,12 @@ 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 echo '%dir %{_datadir}/cockpit/ssh' >> base.list -find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list -echo '%{_libexecdir}/cockpit-ssh' >> base.list %if %{with pcp} echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list %endif -echo '%dir %{_datadir}/cockpit/tuned' > system.list -find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list - echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -304,6 +300,7 @@ fi %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %{_mandir}/man8/%{name}_session_selinux.8cockpit.* %{_mandir}/man8/%{name}_ws_selinux.8cockpit.* +%{python3_sitelib}/cockpit* %if %{with pcp} %files pcp @@ -323,6 +320,12 @@ fi %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz,cockpit-tls.8.gz} %changelog +* Tue Jan 23 2024 zhouwenpei - 309-1 +- Type:NA +- ID:NA +- SUG:NA +- DESC:Update to upstream 309 release + * Tue Mar 28 2023 zhouwenpei - 285-2 - Type:NA - ID:NA