diff --git a/.gitignore b/.gitignore index 3edb0f3..cee6a94 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /cockpit-0.68.tar.bz2 /cockpit-0.69.tar.bz2 /cockpit-0.70.tar.bz2 +/cockpit-0.71.tar.bz2 diff --git a/cockpit.spec b/cockpit.spec index b6b7f39..74e2420 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -36,7 +36,7 @@ Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else -Version: 0.70 +Version: 0.71 %endif Release: 1%{?dist} Summary: A user interface for Linux servers @@ -53,7 +53,6 @@ Source1: cockpit.pam BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 BuildRequires: pam-devel @@ -71,7 +70,7 @@ BuildRequires: glib-networking BuildRequires: sed BuildRequires: glib2-devel >= 2.37.4 -BuildRequires: systemd +BuildRequires: systemd-devel BuildRequires: polkit BuildRequires: pcp-libs-devel @@ -287,11 +286,11 @@ cat subscriptions.list docker.list >> shell.list %files pcp %{_libexecdir}/cockpit-pcp -/var/lib/pcp/config/pmlogconf/tools/cockpit +%{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit %post pcp # 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 # We can't use "systemctl reload-or-try-restart" since systemctl might # be out of sync with reality. @@ -311,7 +310,7 @@ cat subscriptions.list docker.list >> shell.list %{_sbindir}/remotectl %{_libexecdir}/cockpit-ws %attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session -%attr(775, -, wheel) %{_sharedstatedir}/%{name} +%attr(775, -, wheel) %{_localstatedir}/lib/%{name} %{_datadir}/%{name}/static %{_datadir}/%{name}/branding @@ -365,7 +364,7 @@ This package is not yet complete. %package kubernetes Summary: Cockpit user interface for Kubernetes cluster -Requires: kubernetes-client >= 0.20.0 +Requires: /usr/bin/kubectl %description 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 /sbin/fixfiles -R cockpit restore || : /sbin/fixfiles -R cockpit-test-assets restore || : -/sbin/restorecon -R %{_sharedstatedir}/%{name} +/sbin/restorecon -R %{_localstatedir}/lib/%{name} %postun selinux-policy if [ $1 -eq 0 ] ; then /usr/sbin/semodule -s targeted -r cockpit &> /dev/null || : /sbin/fixfiles -R cockpit-selinux-policy restore || : - [ -d %{_sharedstatedir}/%{name} ] && \ - /sbin/restorecon -R %{_sharedstatedir}/%{name} &> /dev/null || : + [ -d %{_localstatedir}/lib/%{name} ] && \ + /sbin/restorecon -R %{_localstatedir}/lib/%{name} &> /dev/null || : fi %endif %changelog +* Mon Aug 17 2015 Peter - 0.71-1 +- Update to 0.71 release. + * Wed Aug 12 2015 Stef Walter - 0.70-1 -- Update to 0.70 release - Depend on kubernetes-client instead of kubernetes +- Update to 0.70 release. * Thu Aug 06 2015 Stef Walter - 0.69-1 - Update to 0.69 release. diff --git a/sources b/sources index c0dfbd2..e3eca55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89372c7929f1f964947a8fc9a1c7408f cockpit-0.70.tar.bz2 +b99aa828513fd0ec0fcfff4e9d9304e1 cockpit-0.71.tar.bz2