From e9ac67ecd2863c308bd0ce66758c27ee90682ae9 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Wed, 16 Nov 2016 10:53:48 +0000 Subject: [PATCH] Update to 124-1 - Build and test on Debian Jessie - Deprecate older javascript files - Properly terminate user sessions on the Accounts page - Fix regression on login screen in older Internet Explorer browsers - Fix regression where Date Picker was not shown in System Time dialog --- .gitignore | 1 + cockpit.spec | 48 +++++++++++++++++++----------------------------- sources | 2 +- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 38f7f00..f41b6cd 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /cockpit-121.tar.xz /cockpit-122.tar.xz /cockpit-123.tar.xz +/cockpit-124.tar.xz diff --git a/cockpit.spec b/cockpit.spec index a294e52..d43153f 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 123 +Version: 124 Release: 1%{?dist} # # This file is maintained at the following location: @@ -12,16 +12,11 @@ Release: 1%{?dist} # # Globals that may be defined elsewhere # * Version 122 -# * gitcommit xxxx +# * wip 1 # -%if %{defined gitcommit} -%define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g -DWITH_DEBUG' -%define required_base %{gitcommit} -%else # earliest base that the subpackages work on %define required_base 122 -%endif %if 0%{?centos} %define rhel 0 @@ -35,15 +30,12 @@ Release: 1%{?dist} %endif Name: cockpit -%if %{defined gitcommit} -%else -%endif Summary: A user interface for Linux servers License: LGPLv2+ URL: http://cockpit-project.org/ -%if %{defined gitcommit} +%if %{defined wip} Source0: cockpit-%{version}.tar.gz %else Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -71,11 +63,8 @@ BuildRequires: glib2-devel >= 2.37.4 BuildRequires: systemd-devel BuildRequires: polkit BuildRequires: pcp-libs-devel -BuildRequires: gdb - -%if %{defined gitcommit} BuildRequires: krb5-server -%endif +BuildRequires: gdb # For documentation BuildRequires: xmlto @@ -91,7 +80,7 @@ Requires: %{name}-shell = %{version}-%{release} %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 Recommends: %{name}-networkmanager = %{version}-%{release} Recommends: %{name}-storaged = %{version}-%{release} -%ifarch x86_64 %{arm} aarch64 ppc64 ppc64le +%ifarch x86_64 %{arm} aarch64 ppc64le Recommends: %{name}-docker = %{version}-%{release} %endif Suggests: %{name}-pcp = %{version}-%{release} @@ -174,7 +163,7 @@ make -j4 check %install make install DESTDIR=%{buildroot} -%if %{defined gitcommit} || 0%{?rhel} +%if %{defined wip} || 0%{?rhel} make install-test-assets DESTDIR=%{buildroot} %else rm -rf %{buildroot}/%{_datadir}/%{name}/playground @@ -237,7 +226,7 @@ echo '%dir %{_datadir}/%{name}/selinux' > selinux.list find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list %endif -%ifarch x86_64 %{arm} aarch64 ppc64 ppc64le +%ifarch x86_64 %{arm} aarch64 ppc64le echo '%dir %{_datadir}/%{name}/docker' > docker.list find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list %else @@ -246,7 +235,7 @@ touch docker.list %endif %ifarch x86_64 -%if %{defined gitcommit} +%if %{defined wip} %else rm %{buildroot}/%{_datadir}/%{name}/kubernetes/override.json %endif @@ -278,12 +267,7 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell. # https://fedoraproject.org/wiki/PackagingDrafts/Go %global _dwz_low_mem_die_limit 0 -# Only strip out debug info in non wip builds -%if %{defined gitcommit} -%define find_debug_info %{nil} -%else %define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" -%endif # Redefine how debug info is built to slip in our extra debug files %define __debug_install_post \ @@ -302,6 +286,7 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell. %doc %{_mandir}/man1/cockpit.1.gz %files bridge -f base.list +%{_datadir}/%{name}/base1/bundle.min.js.gz %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %attr(4755, -, -) %{_libexecdir}/cockpit-polkit @@ -318,12 +303,10 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell. %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit %post pcp -# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749 -( 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. -/usr/share/pcp/lib/pmlogger reload +/usr/share/pcp/lib/pmlogger condrestart %files ws -f %{name}.lang %doc %{_mandir}/man5/cockpit.conf.5.gz @@ -506,7 +489,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %endif -%ifarch x86_64 %{arm} aarch64 ppc64 ppc64le +%ifarch x86_64 %{arm} aarch64 ppc64le %package docker Summary: Cockpit user interface for Docker containers @@ -544,7 +527,7 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif # we only build test assets on rhel or if we're building from a specific commit -%if %{defined gitcommit} || 0%{?rhel} +%if %{defined wip} || 0%{?rhel} %package test-assets Summary: Additional stuff for testing Cockpit @@ -564,6 +547,13 @@ pulls in some necessary packages via dependencies. # The changelog is automatically generated and merged %changelog +* Wed Nov 16 2016 Stef Walter <> - 124-1 +- Build and test on Debian Jessie +- Deprecate older javascript files +- Properly terminate user sessions on the Accounts page +- Fix regression on login screen in older Internet Explorer browsers +- Fix regression where Date Picker was not shown in System Time dialog + * Thu Nov 10 2016 Stef Walter <> - 123-1 - Release a second tarball with cached javascript dependencies - Start verifying that Cockpit works on Ubuntu 16.04 diff --git a/sources b/sources index b4e23ea..9010a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b778c33f5ff150c2a1462d2c8b53954c cockpit-123.tar.xz +8d81c7d860a57a9e3b70be9a98a48d73 cockpit-124.tar.xz