Update to 0.68 release
This commit is contained in:
parent
fc7a5b9659
commit
b7b6cde6dc
1
.gitignore
vendored
1
.gitignore
vendored
@ -47,3 +47,4 @@
|
|||||||
/cockpit-0.65.tar.bz2
|
/cockpit-0.65.tar.bz2
|
||||||
/cockpit-0.66.tar.bz2
|
/cockpit-0.66.tar.bz2
|
||||||
/cockpit-0.67.tar.bz2
|
/cockpit-0.67.tar.bz2
|
||||||
|
/cockpit-0.68.tar.bz2
|
||||||
|
36
cockpit.spec
36
cockpit.spec
@ -31,7 +31,7 @@ Name: cockpit
|
|||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
Version: %{gitcommit}
|
Version: %{gitcommit}
|
||||||
%else
|
%else
|
||||||
Version: 0.67
|
Version: 0.68
|
||||||
%endif
|
%endif
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A user interface for Linux servers
|
Summary: A user interface for Linux servers
|
||||||
@ -70,11 +70,6 @@ BuildRequires: systemd
|
|||||||
BuildRequires: polkit
|
BuildRequires: polkit
|
||||||
BuildRequires: pcp-libs-devel
|
BuildRequires: pcp-libs-devel
|
||||||
|
|
||||||
# For cockpit-lvm
|
|
||||||
BuildRequires: libgudev1-devel
|
|
||||||
BuildRequires: lvm2-devel
|
|
||||||
BuildRequires: polkit-devel
|
|
||||||
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
BuildRequires: npm
|
BuildRequires: npm
|
||||||
BuildRequires: nodejs
|
BuildRequires: nodejs
|
||||||
@ -94,6 +89,7 @@ BuildRequires: xmlto
|
|||||||
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}
|
||||||
|
Requires: %{name}-storaged = %{version}-%{release}
|
||||||
%ifarch x86_64 armv7hl
|
%ifarch x86_64 armv7hl
|
||||||
Requires: %{name}-docker = %{version}-%{release}
|
Requires: %{name}-docker = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
@ -139,11 +135,7 @@ Requires: shadow-utils
|
|||||||
Requires: grep
|
Requires: grep
|
||||||
Requires: libpwquality
|
Requires: libpwquality
|
||||||
Requires: /usr/bin/date
|
Requires: /usr/bin/date
|
||||||
Requires: mdadm
|
%if 0%{?rhel}
|
||||||
Requires: lvm2
|
|
||||||
%if 0%{?rhel} == 0
|
|
||||||
Requires: udisks2 >= 2.1.0
|
|
||||||
%else
|
|
||||||
Provides: %{name}-subscriptions = %{version}-%{release}
|
Provides: %{name}-subscriptions = %{version}-%{release}
|
||||||
Requires: subscription-manager >= 1.13
|
Requires: subscription-manager >= 1.13
|
||||||
%ifarch x86_64 armv7hl
|
%ifarch x86_64 armv7hl
|
||||||
@ -228,6 +220,9 @@ find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list
|
|||||||
echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
|
echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
|
||||||
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> 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
|
||||||
|
|
||||||
%ifarch x86_64 armv7hl
|
%ifarch x86_64 armv7hl
|
||||||
echo '%dir %{_datadir}/%{name}/docker' > docker.list
|
echo '%dir %{_datadir}/%{name}/docker' > docker.list
|
||||||
find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
|
find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
|
||||||
@ -277,14 +272,8 @@ cat subscriptions.list docker.list >> shell.list
|
|||||||
%{_bindir}/cockpit-bridge
|
%{_bindir}/cockpit-bridge
|
||||||
%attr(4755, -, -) %{_libexecdir}/cockpit-polkit
|
%attr(4755, -, -) %{_libexecdir}/cockpit-polkit
|
||||||
%{_libexecdir}/cockpit-wrapper
|
%{_libexecdir}/cockpit-wrapper
|
||||||
%{_libexecdir}/cockpit-lvm
|
|
||||||
%{_libexecdir}/cockpit-lvm-helper
|
|
||||||
%{_libdir}/security/pam_reauthorize.so
|
%{_libdir}/security/pam_reauthorize.so
|
||||||
%{_datadir}/dbus-1/services/com.redhat.Cockpit.service
|
%{_datadir}/dbus-1/services/com.redhat.Cockpit.service
|
||||||
%{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.LVM.conf
|
|
||||||
%{_datadir}/dbus-1/system-services/com.redhat.Cockpit.LVM.service
|
|
||||||
%{_datadir}/polkit-1/actions/com.redhat.Cockpit.LVM.policy
|
|
||||||
%{_datadir}/cockpit/lvm-nolocking/lvm.conf
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%exclude %{_docdir}/%{name}/AUTHORS
|
%exclude %{_docdir}/%{name}/AUTHORS
|
||||||
@ -382,6 +371,15 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package storaged
|
||||||
|
Summary: Cockpit user interface for storage, using Storaged
|
||||||
|
Requires: storaged >= 2.1.1
|
||||||
|
|
||||||
|
%description storaged
|
||||||
|
The Cockpit component for managing storage. This package uses Storaged.
|
||||||
|
|
||||||
|
%files storaged -f storaged.list
|
||||||
|
|
||||||
%if %{defined gitcommit}
|
%if %{defined gitcommit}
|
||||||
|
|
||||||
%package test-assets
|
%package test-assets
|
||||||
@ -438,8 +436,8 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jul 24 2015 Peter <petervo@redhat.com> - 0.67-1
|
* Wed Jul 29 2015 Peter <petervo@redhat.com> - 0.68-1
|
||||||
- Update to 0.67 release.
|
- Update to 0.68 release.
|
||||||
|
|
||||||
* Thu Jul 23 2015 Peter <petervo@redhat.com> - 0.66-1
|
* Thu Jul 23 2015 Peter <petervo@redhat.com> - 0.66-1
|
||||||
- Update to 0.66 release
|
- Update to 0.66 release
|
||||||
|
Loading…
Reference in New Issue
Block a user