Update to version 0.86
* SOS report UI page * Simpler way for contributors to build cockpit RPMs * Infrastructure for implementing downloads
This commit is contained in:
parent
3fe194315e
commit
eb3e8f1b67
1
.gitignore
vendored
1
.gitignore
vendored
@ -63,3 +63,4 @@
|
|||||||
/cockpit-0.82.tar.bz2
|
/cockpit-0.82.tar.bz2
|
||||||
/cockpit-0.83.tar.bz2
|
/cockpit-0.83.tar.bz2
|
||||||
/cockpit-0.84.tar.bz2
|
/cockpit-0.84.tar.bz2
|
||||||
|
/cockpit-0.86.tar.bz2
|
||||||
|
28
cockpit.spec
28
cockpit.spec
@ -1,4 +1,4 @@
|
|||||||
%define tag 0.84
|
%define tag 0.86
|
||||||
%define rev 1
|
%define rev 1
|
||||||
#
|
#
|
||||||
# This file is maintained at the following location:
|
# This file is maintained at the following location:
|
||||||
@ -144,13 +144,15 @@ The Cockpit Web Service listens on the network, and authenticates users.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
exec 2>&1
|
||||||
%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 --with-branding=%{branding} --with-selinux-config-type=etc_t
|
%configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding} --with-selinux-config-type=etc_t
|
||||||
make -j4 %{?extra_flags} all
|
make -j4 %{?extra_flags} all
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
exec 2>&1
|
||||||
make -j4 check
|
make -j4 check
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -167,6 +169,9 @@ 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
|
||||||
install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
|
install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
|
||||||
|
|
||||||
|
# This is not yet packaged
|
||||||
|
rm -rf %{buildroot}%{_datadir}/%{name}/registry
|
||||||
|
|
||||||
# Build the package lists for resource packages
|
# Build the package lists for resource packages
|
||||||
echo '%dir %{_datadir}/%{name}/base1' > shell.list
|
echo '%dir %{_datadir}/%{name}/base1' > shell.list
|
||||||
find %{buildroot}%{_datadir}/%{name}/base1 -type f >> shell.list
|
find %{buildroot}%{_datadir}/%{name}/base1 -type f >> shell.list
|
||||||
@ -186,6 +191,9 @@ find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list
|
|||||||
echo '%dir %{_datadir}/%{name}/users' >> shell.list
|
echo '%dir %{_datadir}/%{name}/users' >> shell.list
|
||||||
find %{buildroot}%{_datadir}/%{name}/users -type f >> shell.list
|
find %{buildroot}%{_datadir}/%{name}/users -type f >> shell.list
|
||||||
|
|
||||||
|
echo '%dir %{_datadir}/%{name}/sosreport' > sosreport.list
|
||||||
|
find %{buildroot}%{_datadir}/%{name}/sosreport -type f >> sosreport.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
|
||||||
|
|
||||||
@ -330,6 +338,17 @@ This package contains the Cockpit shell UI assets.
|
|||||||
|
|
||||||
%files shell -f shell.list
|
%files shell -f shell.list
|
||||||
|
|
||||||
|
%package sosreport
|
||||||
|
Summary: Cockpit user interface for diagnostic reports
|
||||||
|
Requires: sos
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description sosreport
|
||||||
|
The Cockpit component for creating diagnostic reports with the
|
||||||
|
sosreport tool.
|
||||||
|
|
||||||
|
%files sosreport -f sosreport.list
|
||||||
|
|
||||||
%package storaged
|
%package storaged
|
||||||
Summary: Cockpit user interface for storage, using Storaged
|
Summary: Cockpit user interface for storage, using Storaged
|
||||||
Requires: storaged >= 2.1.1
|
Requires: storaged >= 2.1.1
|
||||||
@ -417,6 +436,11 @@ pulls in some necessary packages via dependencies.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 04 2015 Stef Walter <stefw@redhat.com> - 0.86-1
|
||||||
|
- * SOS report UI page
|
||||||
|
- * Simpler way for contributors to build cockpit RPMs
|
||||||
|
- * Infrastructure for implementing downloads
|
||||||
|
|
||||||
* Wed Nov 18 2015 Stef Walter <stefw@redhat.com> - 0.84-1
|
* Wed Nov 18 2015 Stef Walter <stefw@redhat.com> - 0.84-1
|
||||||
- * Add a cockpit manual page
|
- * Add a cockpit manual page
|
||||||
- * Set correct SELinux context for certificates
|
- * Set correct SELinux context for certificates
|
||||||
|
Loading…
Reference in New Issue
Block a user