From e14ba4fb1ca6b7d581bea28c5e93efd222fb8305 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 14 Nov 2014 15:54:17 +0100 Subject: [PATCH] Update to 0.31 release --- cockpit.spec | 19 +++++++++++++------ sources | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index cad1b93..53a14b4 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,6 @@ -# This global is defined by test builders like make-rpms -# global gitcommit blah +# Globals that might be defined elsewhere +# * gitcommit xxxx +# * selinux 1 # Our SELinux policy gets built in tests and f21 and lower %if %{defined gitcommit} @@ -17,7 +18,7 @@ Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else -Version: 0.30 +Version: 0.31 %endif Release: 1%{?dist} Summary: A user interface for Linux servers @@ -55,14 +56,17 @@ BuildRequires: glib-networking BuildRequires: systemd BuildRequires: perl-JavaScript-Minifier-XS -BuildRequires: perl-Locale-PO -BuildRequires: perl-JSON # jsl hangs on arm on html files %ifnarch %{arm} BuildRequires: jsl %endif +%if %{defined gitcommit} +BuildRequires: npm +BuildRequires: nodejs +%endif + # For selinux %if %{defined selinux} BuildRequires: selinux-policy-devel @@ -186,7 +190,7 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/ %{_datadir}/%{name}/base %{_datadir}/%{name}/shell %{_datadir}/%{name}/playground -%{_datadir}/%{name}/server +%{_datadir}/%{name}/server-systemd %files ws %doc %{_mandir}/man5/cockpit.conf.5.gz @@ -274,6 +278,9 @@ fi %endif %changelog +* Fri Nov 14 2014 Stef Walter - 0.31-1 +- Update to 0.31 release + * Wed Nov 12 2014 Stef Walter - 0.30-1 - Update to 0.30 release - Split Cockpit into various sub packages diff --git a/sources b/sources index 6969d51..affa770 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ace9bd45947de1720b6b0daa777d3d8 cockpit-0.30.tar.bz2 +dfbf815e209336532f4a2e6655a3d66d cockpit-0.31.tar.bz2