Only build cockpit-docker stuff on x86_64
* Docker doesn't support mulitple architectures (!)
This commit is contained in:
parent
4236e83242
commit
efc62360bb
39
cockpit.spec
39
cockpit.spec
@ -20,7 +20,7 @@ Version: %{gitcommit}
|
|||||||
%else
|
%else
|
||||||
Version: 0.33
|
Version: 0.33
|
||||||
%endif
|
%endif
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A user interface for Linux servers
|
Summary: A user interface for Linux servers
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -98,18 +98,6 @@ 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}
|
||||||
@ -171,6 +159,10 @@ install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
|
|||||||
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
|
||||||
|
rm -rf %{buildroot}/%{_datadir}/%{name}/docker
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_docdir}/%{name}/AUTHORS
|
%{_docdir}/%{name}/AUTHORS
|
||||||
@ -192,9 +184,6 @@ 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
|
||||||
@ -232,6 +221,21 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
|
|||||||
|
|
||||||
# Conditionally built packages below
|
# Conditionally built packages below
|
||||||
|
|
||||||
|
%ifarch x86_64
|
||||||
|
|
||||||
|
%package docker
|
||||||
|
Summary: Cockpit user interface for Docker containers
|
||||||
|
Requires: docker
|
||||||
|
|
||||||
|
%description docker
|
||||||
|
The Cockpit components for interacting with Docker and user interface.
|
||||||
|
This package is not yet complete.
|
||||||
|
|
||||||
|
%files docker
|
||||||
|
%{_datadir}/%{name}/docker
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
|
|
||||||
%package test-assets
|
%package test-assets
|
||||||
@ -287,6 +291,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Wed Dec 03 2014 Stef Walter <stefw@redhat.com> - 0.33-1
|
||||||
- Update to 0.33 release
|
- Update to 0.33 release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user