forked from cockpit/cockpit
- Update to 0.79
* Vagrant file for Cockpit development * Use libvirt for testing * Display only last lines of Kubernetes container logs See https://github.com/cockpit-project/cockpit/releases OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=20
This commit is contained in:
parent
968c9beb59
commit
5f5b93b770
BIN
cockpit-0.38.tar.bz2
(Stored with Git LFS)
BIN
cockpit-0.38.tar.bz2
(Stored with Git LFS)
Binary file not shown.
BIN
cockpit-0.79.tar.bz2
(Stored with Git LFS)
Normal file
BIN
cockpit-0.79.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 13 11:41:44 UTC 2015 - kkaempf@suse.com
|
||||||
|
|
||||||
|
- Update to 0.79
|
||||||
|
* Vagrant file for Cockpit development
|
||||||
|
* Use libvirt for testing
|
||||||
|
* Display only last lines of Kubernetes container logs
|
||||||
|
|
||||||
|
See https://github.com/cockpit-project/cockpit/releases
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Feb 7 13:22:23 UTC 2015 - kkaempf@suse.com
|
Sat Feb 7 13:22:23 UTC 2015 - kkaempf@suse.com
|
||||||
|
|
||||||
|
515
cockpit.spec
515
cockpit.spec
@ -1,10 +1,33 @@
|
|||||||
# Globals that might be defined elsewhere
|
#
|
||||||
|
# This file is maintained at the following location:
|
||||||
|
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
|
||||||
|
#
|
||||||
|
# If you are editing this file in another location, changes will likely
|
||||||
|
# be clobbered the next time an automated release is done.
|
||||||
|
#
|
||||||
|
# Check first cockpit-devel@lists.fedorahosted.org
|
||||||
|
#
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
%global tag 0.79
|
||||||
|
%else
|
||||||
|
# Globals that may be defined elsewhere
|
||||||
# * gitcommit xxxx
|
# * gitcommit xxxx
|
||||||
# * selinux 1
|
# * selinux 1
|
||||||
|
# * tag 0.71
|
||||||
|
#
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define branding auto
|
||||||
|
%define rev 1
|
||||||
|
|
||||||
# Our SELinux policy gets built in tests and f21 and lower
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
%define extra_flags CFLAGS='-O2 -Wall -Werror'
|
%define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g -DWITH_DEBUG'
|
||||||
|
%define branding default
|
||||||
|
%endif
|
||||||
|
|
||||||
|
#Defaults for our SELinux policy toggle
|
||||||
|
%if %{undefined selinux}
|
||||||
|
%if %{defined gitcommit}
|
||||||
%define selinux 1
|
%define selinux 1
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} > 0 && 0%{?fedora} <= 21
|
%if 0%{?fedora} > 0 && 0%{?fedora} <= 21
|
||||||
@ -13,14 +36,25 @@
|
|||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%define selinux 1
|
%define selinux 1
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?centos}
|
||||||
|
%define rhel 0
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define _hardened_build 1
|
||||||
|
|
||||||
|
%define libssh_version 0.7.1
|
||||||
|
%if 0%{?fedora} > 0 && 0%{?fedora} < 22
|
||||||
|
%define libssh_version 0.6.0
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: cockpit
|
Name: cockpit
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
Version: %{gitcommit}
|
Version: %{gitcommit}
|
||||||
%else
|
%else
|
||||||
Version: 0.38
|
Version: %{tag}
|
||||||
%endif
|
%endif
|
||||||
Release: 1%{?dist}
|
Release: %{rev}%{?dist}
|
||||||
Summary: A user interface for Linux servers
|
Summary: A user interface for Linux servers
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -42,23 +76,20 @@ Source1: cockpit-fedora.pam
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||||
BuildRequires: pkgconfig(gudev-1.0)
|
|
||||||
BuildRequires: pkgconfig(json-glib-1.0)
|
BuildRequires: pkgconfig(json-glib-1.0)
|
||||||
BuildRequires: pkgconfig(udisks2) >= 2.1.0
|
|
||||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
|
||||||
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
|
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
|
||||||
BuildRequires: pkgconfig(accountsservice) >= 0.6.35
|
|
||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
|
|
||||||
BuildRequires: autoconf automake
|
BuildRequires: autoconf automake
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libssh-devel >= 0.6.0
|
BuildRequires: libssh-devel >= %{libssh_version}
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# enable before submitting to Factory
|
BuildRequires: -post-build-checks
|
||||||
|
BuildRequires: -rpmlint-mini
|
||||||
BuildRequires: -rpmlint-Factory
|
BuildRequires: -rpmlint-Factory
|
||||||
%define extra_flags CFLAGS='$(RPM_OPT_FLAGS)'
|
%define extra_flags CFLAGS='$(RPM_OPT_FLAGS)'
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
@ -66,48 +97,50 @@ BuildRequires: docbook-xsl-stylesheets
|
|||||||
BuildRequires: keyutils-devel
|
BuildRequires: keyutils-devel
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: libpcp-devel
|
BuildRequires: libpcp-devel
|
||||||
%{?systemd_requires}
|
|
||||||
BuildRequires: -systemd-mini
|
|
||||||
BuildRequires: -systemd-mini-devel
|
|
||||||
%else
|
%else
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
BuildRequires: keyutils-libs-devel
|
BuildRequires: keyutils-libs-devel
|
||||||
BuildRequires: dbus-devel
|
|
||||||
BuildRequires: pcp-libs-devel
|
BuildRequires: pcp-libs-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: glib-networking
|
BuildRequires: glib-networking
|
||||||
|
BuildRequires: sed
|
||||||
|
|
||||||
|
BuildRequires: glib2-devel >= 2.37.4
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: gdb
|
||||||
|
BuildRequires: glib-networking
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: polkit
|
BuildRequires: polkit
|
||||||
|
|
||||||
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
BuildRequires: npm
|
BuildRequires: npm
|
||||||
BuildRequires: nodejs
|
BuildRequires: nodejs
|
||||||
|
# For kerberos tests
|
||||||
|
BuildRequires: krb5-server
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# For selinux
|
# For selinux
|
||||||
%if %{defined selinux}
|
%if 0%{?selinux}
|
||||||
BuildRequires: selinux-policy-devel
|
BuildRequires: selinux-policy-devel
|
||||||
BuildRequires: checkpolicy
|
BuildRequires: checkpolicy
|
||||||
BuildRequires: /usr/share/selinux/devel/policyhelp
|
BuildRequires: selinux-policy-doc
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# For documentation
|
# For documentation
|
||||||
%if 0%{?suse_version}
|
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
%else
|
|
||||||
BuildRequires: /usr/bin/xmlto
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: %{name}-bridge = %{version}-%{release}
|
Requires: %{name}-bridge = %{version}-%{release}
|
||||||
Requires: %{name}-daemon = %{version}-%{release}
|
Requires: %{name}-networkmanager = %{version}-%{release}
|
||||||
Requires: %{name}-ws = %{version}-%{release}
|
Requires: %{name}-ws = %{version}-%{release}
|
||||||
Requires: %{name}-shell = %{version}-%{release}
|
Requires: %{name}-shell = %{version}-%{release}
|
||||||
%ifarch x86_64
|
Requires: %{name}-storaged = %{version}-%{release}
|
||||||
|
%ifarch x86_64 armv7hl
|
||||||
Requires: %{name}-docker = %{version}-%{release}
|
Requires: %{name}-docker = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
%if %{defined selinux}
|
%if 0%{?rhel}
|
||||||
Requires: %{name}-selinux-policy = %{version}-%{release}
|
Requires: %{name}-subscriptions = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -116,24 +149,14 @@ machines.
|
|||||||
|
|
||||||
%package bridge
|
%package bridge
|
||||||
Summary: Cockpit bridge server-side component
|
Summary: Cockpit bridge server-side component
|
||||||
|
Provides: %{name}-daemon
|
||||||
|
Obsoletes: %{name}-daemon < 0.48-2
|
||||||
|
Requires: polkit
|
||||||
|
|
||||||
%description bridge
|
%description bridge
|
||||||
The Cockpit bridge component installed server side and runs commands on the
|
The Cockpit bridge component installed server side and runs commands on the
|
||||||
system on behalf of the web based user interface.
|
system on behalf of the web based user interface.
|
||||||
|
|
||||||
%package daemon
|
|
||||||
Summary: Deprecated wrappers for various configuration APIs
|
|
||||||
Requires: udisks2 >= 2.1.0
|
|
||||||
Requires: mdadm
|
|
||||||
Requires: lvm2
|
|
||||||
Requires: realmd
|
|
||||||
Requires: storaged
|
|
||||||
|
|
||||||
%description daemon
|
|
||||||
Summary: Deprecated wrappers for various configuration APIs such as udisks2
|
|
||||||
and accountsservice. Soon these will be accessed directly from the cockpit
|
|
||||||
user interface, and this package will disappear.
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Cockpit deployment and developer guide
|
Summary: Cockpit deployment and developer guide
|
||||||
|
|
||||||
@ -142,20 +165,20 @@ The Cockpit Deployment and Developer Guide shows sysadmins how to
|
|||||||
deploy Cockpit on their machines as well as helps developers who want to
|
deploy Cockpit on their machines as well as helps developers who want to
|
||||||
embed or extend Cockpit.
|
embed or extend Cockpit.
|
||||||
|
|
||||||
%package shell
|
%package pcp
|
||||||
Summary: Cockpit Shell user interface package
|
Summary: Cockpit PCP integration
|
||||||
Requires: %{name}-bridge = %{version}-%{release}
|
Requires: %{name}-bridge = %{version}-%{release}
|
||||||
Requires: NetworkManager
|
|
||||||
Requires: pcp
|
Requires: pcp
|
||||||
Obsoletes: %{name}-assets
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description shell
|
%description pcp
|
||||||
This package contains the Cockpit shell UI assets.
|
Cockpit support for reading PCP metrics and loading PCP archives.
|
||||||
|
|
||||||
%package ws
|
%package ws
|
||||||
Summary: Cockpit Web Service
|
Summary: Cockpit Web Service
|
||||||
Requires: glib-networking
|
Requires: glib-networking
|
||||||
|
Requires: openssl
|
||||||
|
Requires: glib2 >= 2.37.4
|
||||||
|
Requires: libssh >= %{libssh_version}
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
@ -173,36 +196,70 @@ The Cockpit Web Service listens on the network, and authenticates users.
|
|||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
env NOCONFIGURE=1 ./autogen.sh
|
env NOCONFIGURE=1 ./autogen.sh
|
||||||
%endif
|
%endif
|
||||||
%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws
|
%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding}
|
||||||
make -j1 %{?extra_flags} all
|
make -j %{?extra_flags} all
|
||||||
%if %{defined selinux}
|
%if 0%{?selinux}
|
||||||
make selinux
|
make selinux
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# The check doesnt run on koji as it requires network
|
make -j check
|
||||||
# make check
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
make install DESTDIR=%{buildroot}
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
make install-test-assets DESTDIR=%{buildroot}
|
make install-test-assets DESTDIR=%{buildroot}
|
||||||
mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d
|
mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d
|
||||||
cp src/bridge/polkit-workarounds.rules %{buildroot}/%{_datadir}/polkit-1/rules.d
|
cp src/bridge/polkit-workarounds.rules %{buildroot}/%{_datadir}/polkit-1/rules.d
|
||||||
|
%else
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/%{name}/playground
|
||||||
%endif
|
%endif
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
|
||||||
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
|
install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
|
||||||
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
|
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
install -d %{buildroot}%{_docdir}/%{name}
|
install -d %{buildroot}%{_docdir}/%{name}
|
||||||
%endif
|
%endif
|
||||||
install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
|
install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
|
||||||
%if %{defined selinux}
|
%if 0%{?selinux}
|
||||||
install -d %{buildroot}%{_datadir}/selinux/targeted
|
install -d %{buildroot}%{_datadir}/selinux/targeted
|
||||||
install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
|
install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
|
||||||
%endif
|
%endif
|
||||||
%ifnarch x86_64
|
|
||||||
|
# Build the package lists for resource packages
|
||||||
|
echo '%dir %{_datadir}/%{name}/base1' > shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/base1 -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/dashboard' >> shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/dashboard -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/domain' >> shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/domain -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/shell' >> shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/shell -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/system' >> shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/users' >> shell.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/users -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> subscriptions.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/storage' > storaged.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/storage -type f >> storaged.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/network' > networkmanager.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/network -type f >> networkmanager.list
|
||||||
|
|
||||||
|
%ifarch x86_64 armv7hl
|
||||||
|
echo '%dir %{_datadir}/%{name}/docker' > docker.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
|
||||||
|
%else
|
||||||
rm -rf %{buildroot}/%{_datadir}/%{name}/docker
|
rm -rf %{buildroot}/%{_datadir}/%{name}/docker
|
||||||
|
touch docker.list
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%suse_update_desktop_file -u -r -G 'Cockpit Server Manager' %{name} System Utility
|
%suse_update_desktop_file -u -r -G 'Cockpit Server Manager' %{name} System Utility
|
||||||
@ -216,6 +273,40 @@ mv %{buildroot}%{_libdir}/security/pam_reauthorize.so %{buildroot}/%{_lib}/secur
|
|||||||
rm -rf %{_libdir}/security
|
rm -rf %{_libdir}/security
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%ifarch x86_64
|
||||||
|
echo '%dir %{_datadir}/%{name}/kubernetes' > kubernetes.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/kubernetes -type f >> kubernetes.list
|
||||||
|
%else
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
|
||||||
|
touch kubernetes.list
|
||||||
|
%endif
|
||||||
|
|
||||||
|
sed -i "s|%{buildroot}||" *.list
|
||||||
|
|
||||||
|
# Build the package lists for debug package, and move debug files to installed locations
|
||||||
|
find %{buildroot}/usr/src/debug%{_datadir}/%{name} -type f -o -type l > debug.list
|
||||||
|
sed -i "s|%{buildroot}/usr/src/debug||" debug.list
|
||||||
|
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
|
||||||
|
rm -rf %{buildroot}/usr/src/debug
|
||||||
|
|
||||||
|
# On RHEL subscriptions, networkmanager, and docker are part of the shell package
|
||||||
|
%if 0%{?rhel}
|
||||||
|
cat subscriptions.list docker.list networkmanager.list >> shell.list
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Only strip out debug info in non wip builds
|
||||||
|
%if %{defined gitcommit}
|
||||||
|
%define find_debug_info %{nil}
|
||||||
|
%else
|
||||||
|
%define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Redefine how debug info is built to slip in our extra debug files
|
||||||
|
%define __debug_install_post \
|
||||||
|
%{find_debug_info} \
|
||||||
|
cat debug.list >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
|
||||||
|
%{nil}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -223,9 +314,7 @@ rm -rf %{_libdir}/security
|
|||||||
%{_docdir}/%{name}/AUTHORS
|
%{_docdir}/%{name}/AUTHORS
|
||||||
%{_docdir}/%{name}/COPYING
|
%{_docdir}/%{name}/COPYING
|
||||||
%{_docdir}/%{name}/README.md
|
%{_docdir}/%{name}/README.md
|
||||||
%if 0%{?suse_version}
|
|
||||||
%dir %{_datadir}/%{name}
|
%dir %{_datadir}/%{name}
|
||||||
%endif
|
|
||||||
%{_datadir}/appdata
|
%{_datadir}/appdata
|
||||||
%{_datadir}/applications
|
%{_datadir}/applications
|
||||||
%{_datadir}/pixmaps
|
%{_datadir}/pixmaps
|
||||||
@ -243,14 +332,6 @@ rm -rf %{_libdir}/security
|
|||||||
%{_libdir}/security/pam_reauthorize.so
|
%{_libdir}/security/pam_reauthorize.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files daemon
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%endif
|
|
||||||
%doc %{_mandir}/man8/cockpitd.8.gz
|
|
||||||
%{_datadir}/dbus-1/services/com.redhat.Cockpit.service
|
|
||||||
%{_libexecdir}/cockpitd
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -260,20 +341,17 @@ rm -rf %{_libdir}/security
|
|||||||
%exclude %{_docdir}/%{name}/README.md
|
%exclude %{_docdir}/%{name}/README.md
|
||||||
%{_docdir}/%{name}
|
%{_docdir}/%{name}
|
||||||
|
|
||||||
%files shell
|
%files pcp
|
||||||
%if 0%{?suse_version}
|
%{_libexecdir}/cockpit-pcp
|
||||||
%defattr(-,root,root)
|
%{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit
|
||||||
%endif
|
|
||||||
%{_datadir}/%{name}/base
|
|
||||||
%{_datadir}/%{name}/shell
|
|
||||||
%{_datadir}/%{name}/playground
|
|
||||||
%{_datadir}/%{name}/server-systemd
|
|
||||||
|
|
||||||
%if !0%{?suse_version}
|
%post pcp
|
||||||
%post shell
|
|
||||||
# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749
|
# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749
|
||||||
( cd /var/lib/pcp/pmns && ./Rebuild -du )
|
( cd %{_localstatedir}/lib/pcp/pmns && ./Rebuild -du )
|
||||||
%endif
|
# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185764
|
||||||
|
# We can't use "systemctl reload-or-try-restart" since systemctl might
|
||||||
|
# be out of sync with reality.
|
||||||
|
/usr/share/pcp/lib/pmlogger reload
|
||||||
|
|
||||||
%files ws
|
%files ws
|
||||||
%{_sbindir}/rccockpit
|
%{_sbindir}/rccockpit
|
||||||
@ -282,6 +360,8 @@ rm -rf %{_libdir}/security
|
|||||||
%endif
|
%endif
|
||||||
%doc %{_mandir}/man5/cockpit.conf.5.gz
|
%doc %{_mandir}/man5/cockpit.conf.5.gz
|
||||||
%doc %{_mandir}/man8/cockpit-ws.8.gz
|
%doc %{_mandir}/man8/cockpit-ws.8.gz
|
||||||
|
%doc %{_mandir}/man8/remotectl.8.gz
|
||||||
|
%doc %{_mandir}/man8/pam_ssh_add.8.gz
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}
|
%config(noreplace) %{_sysconfdir}/%{name}
|
||||||
%config(noreplace) %{_sysconfdir}/pam.d/cockpit
|
%config(noreplace) %{_sysconfdir}/pam.d/cockpit
|
||||||
%{_unitdir}/cockpit.service
|
%{_unitdir}/cockpit.service
|
||||||
@ -290,12 +370,14 @@ rm -rf %{_libdir}/security
|
|||||||
%{_prefix}/lib/firewalld/services/cockpit.xml
|
%{_prefix}/lib/firewalld/services/cockpit.xml
|
||||||
%endif
|
%endif
|
||||||
%{_sbindir}/remotectl
|
%{_sbindir}/remotectl
|
||||||
|
%{_libdir}/security/pam_ssh_add.so
|
||||||
%{_libexecdir}/cockpit-ws
|
%{_libexecdir}/cockpit-ws
|
||||||
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
|
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
|
||||||
%if !0%{?suse_version}
|
%if !0%{?suse_version}
|
||||||
%attr(775, -, wheel) %{_sharedstatedir}/%{name}
|
%attr(775, -, wheel) %{_localstatedir}/lib/%{name}
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/%{name}/static
|
%{_datadir}/%{name}/static
|
||||||
|
%{_datadir}/%{name}/branding
|
||||||
|
|
||||||
%pre ws
|
%pre ws
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -327,23 +409,102 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
|
|||||||
%systemd_postun_with_restart cockpit.socket
|
%systemd_postun_with_restart cockpit.socket
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package shell
|
||||||
|
Summary: Cockpit Shell user interface package
|
||||||
|
Requires: %{name}-bridge = %{version}-%{release}
|
||||||
|
Requires: shadow-utils
|
||||||
|
Requires: grep
|
||||||
|
Requires: libpwquality
|
||||||
|
Requires: /usr/bin/date
|
||||||
|
%if 0%{?rhel}
|
||||||
|
Provides: %{name}-subscriptions = %{version}-%{release}
|
||||||
|
Requires: subscription-manager >= 1.13
|
||||||
|
Provides: %{name}-networkmanager = %{version}-%{release}
|
||||||
|
Requires: NetworkManager
|
||||||
|
%ifarch x86_64 armv7hl
|
||||||
|
Provides: %{name}-docker = %{version}-%{release}
|
||||||
|
Requires: docker >= 1.3.0
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
Provides: %{name}-assets
|
||||||
|
Obsoletes: %{name}-assets < 0.32
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description shell
|
||||||
|
This package contains the Cockpit shell UI assets.
|
||||||
|
|
||||||
|
%files shell -f shell.list
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%package storaged
|
||||||
|
Summary: Cockpit user interface for storage, using Storaged
|
||||||
|
Requires: storaged >= 2.1.1
|
||||||
|
Requires: storaged-lvm2 >= 2.1.1
|
||||||
|
Requires: device-mapper-multipath
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description storaged
|
||||||
|
The Cockpit component for managing storage. This package uses Storaged.
|
||||||
|
|
||||||
|
%files storaged -f storaged.list
|
||||||
|
|
||||||
# Conditionally built packages below
|
# Conditionally built packages below
|
||||||
|
|
||||||
%ifarch x86_64
|
%if 0%{?rhel} == 0
|
||||||
|
|
||||||
|
%package subscriptions
|
||||||
|
Summary: Cockpit subscription user interface package
|
||||||
|
Requires: subscription-manager >= 1.13
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description subscriptions
|
||||||
|
This package contains the Cockpit user interface integration with local
|
||||||
|
subscription management.
|
||||||
|
|
||||||
|
%files subscriptions -f subscriptions.list
|
||||||
|
|
||||||
|
%package networkmanager
|
||||||
|
Summary: Cockpit user interface for networking, using NetworkManager
|
||||||
|
Requires: NetworkManager
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description networkmanager
|
||||||
|
The Cockpit component for managing networking. This package uses NetworkManager.
|
||||||
|
|
||||||
|
%files networkmanager -f networkmanager.list
|
||||||
|
|
||||||
|
%ifarch x86_64 armv7hl
|
||||||
|
|
||||||
%package docker
|
%package docker
|
||||||
Summary: Cockpit user interface for Docker containers
|
Summary: Cockpit user interface for Docker containers
|
||||||
Requires: docker
|
Requires: docker >= 1.3.0
|
||||||
|
|
||||||
%description docker
|
%description docker
|
||||||
The Cockpit components for interacting with Docker and user interface.
|
The Cockpit components for interacting with Docker and user interface.
|
||||||
This package is not yet complete.
|
This package is not yet complete.
|
||||||
|
|
||||||
%files docker
|
%files docker -f docker.list
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/%{name}/docker
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch x86_64
|
||||||
|
|
||||||
|
%package kubernetes
|
||||||
|
Summary: Cockpit user interface for Kubernetes cluster
|
||||||
|
Requires: /usr/bin/kubectl
|
||||||
|
|
||||||
|
%description kubernetes
|
||||||
|
The Cockpit components for visualizing and configuring a Kubernetes
|
||||||
|
cluster. Installed on the Kubernetes master. This package is not yet complete.
|
||||||
|
|
||||||
|
%files kubernetes -f kubernetes.list
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -361,16 +522,17 @@ pulls in some necessary packages via dependencies.
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%endif
|
%endif
|
||||||
|
%{_datadir}/%{name}/playground
|
||||||
%{_datadir}/cockpit-test-assets
|
%{_datadir}/cockpit-test-assets
|
||||||
%{_datadir}/polkit-1/rules.d
|
%{_datadir}/polkit-1/rules.d
|
||||||
/usr/lib/systemd/system/cockpit-testing.service
|
%{_unitdir}/cockpit-testing.service
|
||||||
/usr/lib/systemd/system/cockpit-testing.socket
|
%{_unitdir}/cockpit-testing.socket
|
||||||
/usr/lib/systemd/system/test-server.service
|
%{_unitdir}/test-server.service
|
||||||
/usr/lib/systemd/system/test-server.socket
|
%{_unitdir}/test-server.socket
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{defined selinux}
|
%if 0%{?selinux}
|
||||||
|
|
||||||
%package selinux-policy
|
%package selinux-policy
|
||||||
Summary: SELinux policy for Cockpit testing
|
Summary: SELinux policy for Cockpit testing
|
||||||
@ -389,191 +551,20 @@ SELinux policy for Cockpit testing.
|
|||||||
%{_datadir}/selinux/targeted/cockpit.pp
|
%{_datadir}/selinux/targeted/cockpit.pp
|
||||||
|
|
||||||
%post selinux-policy
|
%post selinux-policy
|
||||||
/usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/cockpit.pp &> /dev/null || :
|
/usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/cockpit.pp
|
||||||
/sbin/fixfiles -R cockpit restore || :
|
/sbin/fixfiles -R cockpit restore || :
|
||||||
/sbin/fixfiles -R cockpit-test-assets restore || :
|
/sbin/fixfiles -R cockpit-test-assets restore || :
|
||||||
/sbin/restorecon -R %{_sharedstatedir}/%{name} || :
|
/sbin/restorecon -R %{_localstatedir}/lib/%{name}
|
||||||
|
|
||||||
%postun selinux-policy
|
%postun selinux-policy
|
||||||
if [ $1 -eq 0 ] ; then
|
if [ $1 -eq 0 ] ; then
|
||||||
/usr/sbin/semodule -s targeted -r cockpit &> /dev/null || :
|
/usr/sbin/semodule -s targeted -r cockpit &> /dev/null || :
|
||||||
/sbin/fixfiles -R cockpit-selinux-policy restore || :
|
/sbin/fixfiles -R cockpit-selinux-policy restore || :
|
||||||
[ -d %{_sharedstatedir}/%{name} ] && \
|
[ -d %{_localstatedir}/lib/%{name} ] && \
|
||||||
/sbin/restorecon -R %{_sharedstatedir}/%{name} &> /dev/null || :
|
/sbin/restorecon -R %{_localstatedir}/lib/%{name} &> /dev/null || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jan 28 2015 Stef Walter <stefw@redhat.com> - 0.38-1
|
# Upstream changelog is empty
|
||||||
- Update to 0.38 release
|
|
||||||
|
|
||||||
* Thu Jan 22 2015 Stef Walter <stefw@redhat.com> - 0.37-1
|
|
||||||
- Update to 0.37 release
|
|
||||||
|
|
||||||
* Mon Jan 12 2015 Stef Walter <stefw@redhat.com> - 0.36-1
|
|
||||||
- Update to 0.36 release
|
|
||||||
|
|
||||||
* Mon Dec 15 2014 Stef Walter <stefw@redhat.com> - 0.35-1
|
|
||||||
- Update to 0.35 release
|
|
||||||
|
|
||||||
* Thu Dec 11 2014 Stef Walter <stefw@redhat.com> - 0.34-1
|
|
||||||
- Update to 0.34 release
|
|
||||||
|
|
||||||
* Fri Dec 05 2014 Stef Walter <stefw@redhat.com> - 0.33-3
|
|
||||||
- Only depend on docker stuff on x86_64
|
|
||||||
|
|
||||||
* Fri Dec 05 2014 Stef Walter <stefw@redhat.com> - 0.33-2
|
|
||||||
- Only build docker stuff on x86_64
|
|
||||||
|
|
||||||
* Wed Dec 03 2014 Stef Walter <stefw@redhat.com> - 0.33-1
|
|
||||||
- Update to 0.33 release
|
|
||||||
|
|
||||||
* Mon Nov 24 2014 Stef Walter <stefw@redhat.com> - 0.32-1
|
|
||||||
- Update to 0.32 release
|
|
||||||
|
|
||||||
* Fri Nov 14 2014 Stef Walter <stefw@redhat.com> - 0.31-1
|
|
||||||
- Update to 0.31 release
|
|
||||||
|
|
||||||
* Wed Nov 12 2014 Stef Walter <stefw@redhat.com> - 0.30-1
|
|
||||||
- Update to 0.30 release
|
|
||||||
- Split Cockpit into various sub packages
|
|
||||||
|
|
||||||
* Wed Nov 05 2014 Stef Walter <stefw@redhat.com> - 0.29-3
|
|
||||||
- Don't require test-assets from selinux-policy
|
|
||||||
- Other minor tweaks and fixes
|
|
||||||
|
|
||||||
* Wed Nov 05 2014 Stef Walter <stefw@redhat.com> - 0.29-2
|
|
||||||
- Include selinux policy as a dep where required
|
|
||||||
|
|
||||||
* Wed Nov 05 2014 Stef Walter <stefw@redhat.com> - 0.29-1
|
|
||||||
- Update to 0.29 release
|
|
||||||
|
|
||||||
* Thu Oct 16 2014 Stef Walter <stefw@redhat.com> - 0.28-1
|
|
||||||
- Update to 0.28 release
|
|
||||||
- cockpit-agent was renamed to cockpit-bridge
|
|
||||||
|
|
||||||
* Fri Oct 10 2014 Stef Walter <stefw@redhat.com> - 0.27-1
|
|
||||||
- Update to 0.27 release
|
|
||||||
- Don't create cockpit-*-admin groups rhbz#1145135
|
|
||||||
- Fix user management for non-root users rhbz#1140562
|
|
||||||
- Fix 'out of memory' error during ssh auth rhbz#1142282
|
|
||||||
|
|
||||||
* Wed Oct 08 2014 Stef Walter <stefw@redhat.com> - 0.26-1
|
|
||||||
- Update to 0.26 release
|
|
||||||
- Can see disk usage on storage page rhbz#1142459
|
|
||||||
- Better order for lists of block devices rhbz#1142443
|
|
||||||
- Setting container memory limit fixed rhbz#1142362
|
|
||||||
- Can create storage volume of maximum capacity rhbz#1142259
|
|
||||||
- Fix RAID device Bitmap enable/disable error rhbz#1142248
|
|
||||||
- Docker page connects to right machine rhbz#1142229
|
|
||||||
- Clear the format dialog label correctly rhbz#1142228
|
|
||||||
- No 'Drop Privileges' item in menu for root rhbz#1142197
|
|
||||||
- Don't flash 'Server has closed Connection on logout rhbz#1142175
|
|
||||||
- Non-root users can manipulate user accounts rhbz#1142154
|
|
||||||
- Fix strange error message when editing user accounts rhbz#1142154
|
|
||||||
|
|
||||||
* Wed Sep 24 2014 Stef Walter <stefw@redhat.com> - 0.25-1
|
|
||||||
- Update to 0.25 release
|
|
||||||
|
|
||||||
* Wed Sep 17 2014 Stef Walter <stefw@redhat.com> - 0.24-1
|
|
||||||
- Update to 0.24 release
|
|
||||||
|
|
||||||
* Wed Sep 10 2014 Stef Walter <stefw@redhat.com> - 0.23-1
|
|
||||||
- Update to 0.23 release
|
|
||||||
|
|
||||||
* Wed Sep 03 2014 Stef Walter <stefw@redhat.com> - 0.22-1
|
|
||||||
- Update to 0.22 release
|
|
||||||
|
|
||||||
* Tue Aug 26 2014 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.21-1
|
|
||||||
- Update to 0.21 release
|
|
||||||
|
|
||||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Aug 14 2014 Stef Walter <stefw@redhat.com> 0.20-1
|
|
||||||
- Update to 0.20 release
|
|
||||||
|
|
||||||
* Thu Aug 07 2014 Stef Walter <stefw@redhat.com> 0.19-1
|
|
||||||
- Update to 0.19 release
|
|
||||||
|
|
||||||
* Wed Jul 30 2014 Stef Walter <stefw@redhat.com> 0.18-1
|
|
||||||
- Update to 0.18 release
|
|
||||||
- Add glib-networking build requirement
|
|
||||||
- Let selinux-policy-targetted distribute selinux policy
|
|
||||||
|
|
||||||
* Mon Jul 28 2014 Colin Walters <walters@verbum.org> 0.17-2
|
|
||||||
- Drop Requires and references to dead test-assets subpackage
|
|
||||||
|
|
||||||
* Thu Jul 24 2014 Stef Walter <stefw@redhat.com> 0.17-1
|
|
||||||
- Update to 0.17 release
|
|
||||||
|
|
||||||
* Wed Jul 23 2014 Stef Walter <stefw@redhat.com> 0.16-3
|
|
||||||
- Distribute our own selinux policy rhbz#1110758
|
|
||||||
|
|
||||||
* Tue Jul 22 2014 Stef Walter <stefw@redhat.com> 0.16-2
|
|
||||||
- Refer to cockpit.socket in scriptlets rhbz#1110764
|
|
||||||
|
|
||||||
* Thu Jul 17 2014 Stef Walter <stefw@redhat.com> 0.16-1
|
|
||||||
- Update to 0.16 release
|
|
||||||
|
|
||||||
* Thu Jul 10 2014 Stef Walter <stefw@redhat.com> 0.15-1
|
|
||||||
- Update to 0.15 release
|
|
||||||
- Put pam_reauthorize.so in the cockpit PAM stack
|
|
||||||
|
|
||||||
* Thu Jul 03 2014 Stef Walter <stefw@redhat.com> 0.14-1
|
|
||||||
- Update to 0.14 release
|
|
||||||
|
|
||||||
* Mon Jun 30 2014 Stef Walter <stefw@redhat.com> 0.13-1
|
|
||||||
- Update to 0.13 release
|
|
||||||
|
|
||||||
* Tue Jun 24 2014 Stef Walter <stefw@redhat.com> 0.12-1
|
|
||||||
- Update to upstream 0.12 release
|
|
||||||
|
|
||||||
* Fri Jun 20 2014 Stef Walter <stefw@redhat.com> 0.11-1
|
|
||||||
- Update to upstream 0.11 release
|
|
||||||
|
|
||||||
* Thu Jun 12 2014 Stef Walter <stefw@redhat.com> 0.10-1
|
|
||||||
- Update to upstream 0.10 release
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri May 23 2014 Stef Walter <stefw@redhat.com> 0.9-1
|
|
||||||
- Update to upstream 0.9 release
|
|
||||||
- Fix file attribute for cockpit-polkit
|
|
||||||
|
|
||||||
* Wed May 21 2014 Stef Walter <stefw@redhat.com> 0.8-1
|
|
||||||
- Update to upstream 0.8 release
|
|
||||||
- cockpitd now runs as a user session DBus service
|
|
||||||
|
|
||||||
* Mon May 19 2014 Stef Walter <stefw@redhat.com> 0.7-1
|
|
||||||
- Update to upstream 0.7 release
|
|
||||||
|
|
||||||
* Wed May 14 2014 Stef Walter <stefw@redhat.com> 0.6-1
|
|
||||||
- Update to upstream 0.6 release
|
|
||||||
|
|
||||||
* Tue Apr 15 2014 Stef Walter <stefw@redhat.com> 0.5-1
|
|
||||||
- Update to upstream 0.5 release
|
|
||||||
|
|
||||||
* Thu Apr 03 2014 Stef Walter <stefw@redhat.com> 0.4-1
|
|
||||||
- Update to upstream 0.4 release
|
|
||||||
- Lots of packaging cleanup and polish
|
|
||||||
|
|
||||||
* Fri Mar 28 2014 Stef Walter <stefw@redhat.com> 0.3-1
|
|
||||||
- Update to upstream 0.3 release
|
|
||||||
|
|
||||||
* Wed Feb 05 2014 Patrick Uiterwijk (LOCAL) <puiterwijk@redhat.com> - 0.2-0.4.20140204git5e1faad
|
|
||||||
- Redid the release tag
|
|
||||||
|
|
||||||
* Tue Feb 04 2014 Patrick Uiterwijk (LOCAL) <puiterwijk@redhat.com> - 0.2-0.3.5e1faadgit
|
|
||||||
- Fixed license tag
|
|
||||||
- Updated to new FSF address upstream
|
|
||||||
- Removing libgsystem before build
|
|
||||||
- Now claiming specific manpages
|
|
||||||
- Made the config files noreplace
|
|
||||||
- Removed the test assets
|
|
||||||
- Put the web assets in a subpackage
|
|
||||||
|
|
||||||
* Tue Feb 04 2014 Patrick Uiterwijk (LOCAL) <puiterwijk@redhat.com> - 0.2-0.2.5e1faadgit
|
|
||||||
- Patch libgsystem out
|
|
||||||
|
Loading…
Reference in New Issue
Block a user