abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

Accepting request 835202 from systemsmanagement:cockpit

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/835202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2020-09-21 15:19:14 +00:00 committed by Git OBS Bridge
commit 5b73a1a98d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cockpit.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 10 12:49:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- adjust spec file to match upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 4 12:09:16 UTC 2020 - Thorsten Kukuk <kukuk@suse.com> Fri Sep 4 12:09:16 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

16
cockpit.spec
View File

@ -469,19 +469,12 @@ Summary: Cockpit Web Service
Requires: glib-networking Requires: glib-networking
Requires: openssl Requires: openssl
Requires: glib2 >= 2.37.4 Requires: glib2 >= 2.37.4
Requires: group(wheel)
Conflicts: firewalld < 0.6.0-1 Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3 Recommends: sscg >= 2.3
Recommends: system-logos Recommends: system-logos
%if !0%{?suse_version}
Requires: systemd >= 235
%endif
Suggests: sssd-dbus Suggests: sssd-dbus
%if 0%{?suse_version}
Requires(pre): permissions Requires(pre): permissions
%if !0%{?suse_version}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%endif %endif
%description ws %description ws
@ -530,8 +523,7 @@ authentication via sssd/FreeIPA.
%{_libexecdir}/cockpit-wsinstance-factory %{_libexecdir}/cockpit-wsinstance-factory
%{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-tls
%{_libexecdir}/cockpit-desktop %{_libexecdir}/cockpit-desktop
%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
%attr(775, -, wheel) %{_localstatedir}/lib/cockpit
%{_datadir}/cockpit/static %{_datadir}/cockpit/static
%{_datadir}/cockpit/branding %{_datadir}/cockpit/branding
@ -542,7 +534,9 @@ getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance
getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance
%post ws %post ws
%if 0%{?suse_version}
%set_permissions %{_libexecdir}/cockpit-session %set_permissions %{_libexecdir}/cockpit-session
%endif
%tmpfiles_create cockpit-tempfiles.conf %tmpfiles_create cockpit-tempfiles.conf
%systemd_post cockpit.socket %systemd_post cockpit.socket
# firewalld only partially picks up changes to its services files without this # firewalld only partially picks up changes to its services files without this
@ -555,8 +549,10 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
%systemd_postun_with_restart cockpit.socket %systemd_postun_with_restart cockpit.socket
%systemd_postun_with_restart cockpit.service %systemd_postun_with_restart cockpit.service
%if 0%{?suse_version}
%verifyscript ws %verifyscript ws
%verify_permissions -e %{_libexecdir}/cockpit-session %verify_permissions -e %{_libexecdir}/cockpit-session
%endif
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
# Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora # Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora