diff --git a/cockpit-254.tar.xz b/cockpit-285.tar.xz similarity index 49% rename from cockpit-254.tar.xz rename to cockpit-285.tar.xz index 97849d8eb47e676318566ff5a54f1842af00c56b..27a0bfbed5aace38071dadf4f8b37fa203a17484 100644 Binary files a/cockpit-254.tar.xz and b/cockpit-285.tar.xz differ diff --git a/cockpit.spec b/cockpit.spec index b6afd053bd56ef0f59a8241ba2682b78bd1205c6..90a946c65ff99ef0d4b70f3e6c2b085f32d2ef8b 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -2,7 +2,7 @@ %bcond_with pcp Name: cockpit -Version: 254 +Version: 285 Release: 1 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ @@ -101,12 +101,9 @@ man help files. make install-tests DESTDIR=%{buildroot} install -Dpm644 tools/cockpit.pam %{buildroot}%{_sysconfdir}/pam.d/cockpit -strip %{buildroot}/%{_prefix}/lib/cockpit-test-assets/mock-pam-conv-mod.so echo '{ "linguas": null }' > %{buildroot}%{_datadir}/cockpit/shell/override.json -%find_lang %{name} - %pre getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws @@ -143,7 +140,7 @@ fi %systemd_postun_with_restart cockpit.socket %systemd_postun_with_restart cockpit.service -%files -f %{name}.lang +%files %if %{without pcp} %exclude %{_datadir}/cockpit/pcp/* %endif @@ -156,14 +153,13 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/cockpit %config %{_sysconfdir}/issue.d/cockpit.issue %config %{_sysconfdir}/motd.d/cockpit +%ghost %attr(0644, root, root) %{_sysconfdir}/cockpit/disallowed-users %{_datadir}/metainfo/cockpit.appdata.xml %{_datadir}/pixmaps/cockpit.png %{_datadir}/%{name}/motd/{update-motd,inactive.motd} %{_datadir}/%{name}/{static,branding} %{_datadir}/%{name}/{base1,ssh,dashboard,realmd,tuned,shell,systemd,users,metrics,kdump,sosreport,storaged,networkmanager,packagekit,apps,machines,ovirt,selinux}/* %{_unitdir}/{cockpit.service,cockpit-motd.service,cockpit.socket} -%{_unitdir}/cockpit-wsinstance-http-redirect.service -%{_unitdir}/cockpit-wsinstance-http-redirect.socket %{_unitdir}/cockpit-wsinstance-http.service %{_unitdir}/cockpit-wsinstance-http.socket %{_unitdir}/cockpit-wsinstance-https-factory.socket @@ -180,6 +176,11 @@ fi %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{_bindir}/cockpit-bridge %{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy +%dir %{_datadir}/cockpit/shell/images +%{_libdir}/security/mock-pam-conv-mod.so +%{_unitdir}/cockpit-session.socket +%{_unitdir}/cockpit-session@.service +%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml %if %{with pcp} %files pcp @@ -190,7 +191,6 @@ fi %files devel %{_datadir}/cockpit/playground -%{_prefix}/lib/cockpit-test-assets %files help %{_docdir}/cockpit @@ -200,6 +200,12 @@ fi %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz,cockpit-tls.8.gz} %changelog +* Mon Feb 27 2023 lvcongqing - 285-1 +- Type:NA +- ID:NA +- SUG:NA +- DESC:Update to upstream 254 release + * Tue Mar 01 2022 herengui - 254-1 - Type:NA - ID:NA