rpms/cockpit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.71 release

Browse Source
This commit is contained in:
petervo 2015-08-17 09:14:57 -07:00
parent 21b0cf5928
commit 0cccbd8827
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -50,3 +50,4 @@
/cockpit-0.68.tar.bz2 /cockpit-0.68.tar.bz2
/cockpit-0.69.tar.bz2 /cockpit-0.69.tar.bz2
/cockpit-0.70.tar.bz2 /cockpit-0.70.tar.bz2
/cockpit-0.71.tar.bz2

24
cockpit.spec
View File

@ -36,7 +36,7 @@ Name: cockpit
%if %{defined gitcommit} %if %{defined gitcommit}
Version: %{gitcommit} Version: %{gitcommit}
%else %else
Version: 0.70 Version: 0.71
%endif %endif
Release: 1%{?dist} Release: 1%{?dist}
Summary: A user interface for Linux servers Summary: A user interface for Linux servers
@ -53,7 +53,6 @@ Source1: cockpit.pam
BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
BuildRequires: pam-devel BuildRequires: pam-devel
@ -71,7 +70,7 @@ BuildRequires: glib-networking
BuildRequires: sed BuildRequires: sed
BuildRequires: glib2-devel >= 2.37.4 BuildRequires: glib2-devel >= 2.37.4
BuildRequires: systemd BuildRequires: systemd-devel
BuildRequires: polkit BuildRequires: polkit
BuildRequires: pcp-libs-devel BuildRequires: pcp-libs-devel
@ -287,11 +286,11 @@ cat subscriptions.list docker.list >> shell.list
%files pcp %files pcp
%{_libexecdir}/cockpit-pcp %{_libexecdir}/cockpit-pcp
/var/lib/pcp/config/pmlogconf/tools/cockpit %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit
%post pcp %post pcp
# 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 )
# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185764 # HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185764
# We can't use "systemctl reload-or-try-restart" since systemctl might # We can't use "systemctl reload-or-try-restart" since systemctl might
# be out of sync with reality. # be out of sync with reality.
@ -311,7 +310,7 @@ cat subscriptions.list docker.list >> shell.list
%{_sbindir}/remotectl %{_sbindir}/remotectl
%{_libexecdir}/cockpit-ws %{_libexecdir}/cockpit-ws
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session %attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
%attr(775, -, wheel) %{_sharedstatedir}/%{name} %attr(775, -, wheel) %{_localstatedir}/lib/%{name}
%{_datadir}/%{name}/static %{_datadir}/%{name}/static
%{_datadir}/%{name}/branding %{_datadir}/%{name}/branding
@ -365,7 +364,7 @@ This package is not yet complete.
%package kubernetes %package kubernetes
Summary: Cockpit user interface for Kubernetes cluster Summary: Cockpit user interface for Kubernetes cluster
Requires: kubernetes-client >= 0.20.0 Requires: /usr/bin/kubectl
%description kubernetes %description kubernetes
The Cockpit components for visualizing and configuring a Kubernetes The Cockpit components for visualizing and configuring a Kubernetes
@ -427,22 +426,25 @@ SELinux policy for Cockpit testing.
/usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/cockpit.pp /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
* Mon Aug 17 2015 Peter <petervo@redhat.com> - 0.71-1
- Update to 0.71 release.
* Wed Aug 12 2015 Stef Walter <stefw@redhat.com> - 0.70-1 * Wed Aug 12 2015 Stef Walter <stefw@redhat.com> - 0.70-1
- Update to 0.70 release
- Depend on kubernetes-client instead of kubernetes - Depend on kubernetes-client instead of kubernetes
- Update to 0.70 release.
* Thu Aug 06 2015 Stef Walter <stefw@redhat.com> - 0.69-1 * Thu Aug 06 2015 Stef Walter <stefw@redhat.com> - 0.69-1
- Update to 0.69 release. - Update to 0.69 release.

2
sources
View File

@ -1 +1 @@
89372c7929f1f964947a8fc9a1c7408f cockpit-0.70.tar.bz2 b99aa828513fd0ec0fcfff4e9d9304e1 cockpit-0.71.tar.bz2