Update to version 0.33
* Start new cockpit-docker sub-package that depends on docker * Depend on various system components in cockpit-shell
This commit is contained in:
parent
9831a48f52
commit
4236e83242
43
cockpit.spec
43
cockpit.spec
@ -18,7 +18,7 @@ Name: cockpit
|
|||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
Version: %{gitcommit}
|
Version: %{gitcommit}
|
||||||
%else
|
%else
|
||||||
Version: 0.32
|
Version: 0.33
|
||||||
%endif
|
%endif
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A user interface for Linux servers
|
Summary: A user interface for Linux servers
|
||||||
@ -56,13 +56,6 @@ BuildRequires: glib-networking
|
|||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: polkit
|
BuildRequires: polkit
|
||||||
|
|
||||||
BuildRequires: perl-JavaScript-Minifier-XS
|
|
||||||
|
|
||||||
# jsl hangs on arm on html files
|
|
||||||
%ifnarch %{arm}
|
|
||||||
BuildRequires: jsl
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
BuildRequires: npm
|
BuildRequires: npm
|
||||||
BuildRequires: nodejs
|
BuildRequires: nodejs
|
||||||
@ -79,12 +72,6 @@ BuildRequires: sed
|
|||||||
# For documentation
|
# For documentation
|
||||||
BuildRequires: /usr/bin/xmlto
|
BuildRequires: /usr/bin/xmlto
|
||||||
|
|
||||||
Requires: realmd
|
|
||||||
Requires: udisks2 >= 2.1.0
|
|
||||||
Requires: mdadm
|
|
||||||
Requires: lvm2
|
|
||||||
Requires: storaged
|
|
||||||
|
|
||||||
Requires: %{name}-bridge = %{version}-%{release}
|
Requires: %{name}-bridge = %{version}-%{release}
|
||||||
Requires: %{name}-ws = %{version}-%{release}
|
Requires: %{name}-ws = %{version}-%{release}
|
||||||
Requires: %{name}-shell = %{version}-%{release}
|
Requires: %{name}-shell = %{version}-%{release}
|
||||||
@ -111,9 +98,28 @@ 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 docker
|
||||||
|
Summary: Cockpit user interface for Docker containers
|
||||||
|
%if 0%{?fedora}
|
||||||
|
Requires: docker-io
|
||||||
|
%else
|
||||||
|
Requires: docker
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description docker
|
||||||
|
The Cockpit components for interacting with Docker and user interface.
|
||||||
|
This package is not yet complete.
|
||||||
|
|
||||||
%package shell
|
%package shell
|
||||||
Summary: Cockpit Shell user interface package
|
Summary: Cockpit Shell user interface package
|
||||||
Requires: %{name}-bridge = %{version}-%{release}
|
Requires: %{name}-bridge = %{version}-%{release}
|
||||||
|
Requires: %{name}-docker = %{version}-%{release}
|
||||||
|
Requires: NetworkManager
|
||||||
|
Requires: realmd
|
||||||
|
Requires: udisks2 >= 2.1.0
|
||||||
|
Requires: mdadm
|
||||||
|
Requires: lvm2
|
||||||
|
Requires: storaged
|
||||||
Obsoletes: %{name}-assets
|
Obsoletes: %{name}-assets
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -138,7 +144,6 @@ The Cockpit Web Service listens on the network, and authenticates users.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
ls
|
|
||||||
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
|
||||||
@ -187,6 +192,9 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
|
|||||||
%files doc
|
%files doc
|
||||||
%{_docdir}/%{name}
|
%{_docdir}/%{name}
|
||||||
|
|
||||||
|
%files docker
|
||||||
|
%{_datadir}/%{name}/docker
|
||||||
|
|
||||||
%files shell
|
%files shell
|
||||||
%{_datadir}/%{name}/base
|
%{_datadir}/%{name}/base
|
||||||
%{_datadir}/%{name}/shell
|
%{_datadir}/%{name}/shell
|
||||||
@ -279,8 +287,11 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Mon Nov 24 2014 Stef Walter <stefw@redhat.com> - 0.32-1
|
||||||
- Update to 0.31 release
|
- Update to 0.32 release
|
||||||
|
|
||||||
* Fri Nov 14 2014 Stef Walter <stefw@redhat.com> - 0.31-1
|
* Fri Nov 14 2014 Stef Walter <stefw@redhat.com> - 0.31-1
|
||||||
- Update to 0.31 release
|
- Update to 0.31 release
|
||||||
|
Loading…
Reference in New Issue
Block a user