Update to version 0.115

* Setup Docker container and image storage through the UI
 * Use Webpack to build Cockpit UI packages
 * Update the Cockpit Vagrant development box to use Fedora 24

.gitignore

@@ -85,3 +85,4 @@
 /cockpit-0.112.tar.xz
 /cockpit-0.113.tar.xz
 /cockpit-0.114.tar.xz
+/cockpit-0.115.tar.xz

cockpit.spec

@@ -1,4 +1,4 @@
-%define tag 0.114
+%define tag 0.115
 %define rev 1
 #
 # This file is maintained at the following location:
@@ -18,6 +18,10 @@
 
 %if %{defined gitcommit}
 %define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g -DWITH_DEBUG'
+%define stable_api %{gitcommit}
+%else
+# The first version with a stable APIs
+%define stable_api 0.114
 %endif
 
 %if 0%{?centos}
@@ -112,7 +116,6 @@ machines.
 
 %package bridge
 Summary: Cockpit bridge server-side component
-Provides: %{name}-daemon
 Obsoletes: %{name}-daemon < 0.48-2
 Requires: polkit
 
@@ -155,7 +158,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
 
 %build
 exec 2>&1
-%configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=auto --with-selinux-config-type=etc_t
+%configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=auto --with-selinux-config-type=etc_t %{?rhel:--without-storaged-iscsi-sessions}
 make -j4 %{?extra_flags} all
 
 %check
@@ -247,8 +250,10 @@ touch kubernetes.list
 sed -i "s|%{buildroot}||" *.list
 
 # Build the package lists for debug package, and move debug files to installed locations
-find %{buildroot}/usr/src/debug%{_datadir}/%{name} -type f -o -type l > debug.list
+find %{buildroot}/usr/src/debug%{_datadir}/%{name} -type f -o -type l > debug.partial
-sed -i "s|%{buildroot}/usr/src/debug||" debug.list
+sed -i "s|%{buildroot}/usr/src/debug||" debug.partial
+sed -n 's/\.map\(\.gz\)\?$/\0/p' *.list >> debug.partial
+sed -i '/\.map\(\.gz\)\?$/d' *.list
 tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
 rm -rf %{buildroot}/usr/src/debug
 
@@ -271,7 +276,7 @@ cat subscriptions.list sosreport.list networkmanager.list >> shell.list
 # Redefine how debug info is built to slip in our extra debug files
 %define __debug_install_post   \
    %{find_debug_info} \
-   cat debug.list >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
+   cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
 %{nil}
 
 %files
@@ -367,7 +372,8 @@ This package contains the Cockpit shell UI assets.
 
 %package storaged
 Summary: Cockpit user interface for storage, using Storaged
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: storaged >= 2.1.1
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
 Recommends: storaged-lvm2 >= 2.1.1
@@ -387,7 +393,8 @@ The Cockpit component for managing storage.  This package uses Storaged.
 
 %package ostree
 Summary: Cockpit user interface for rpm-ostree
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 %if 0%{?fedora} > 0 && 0%{?fedora} < 24
 Requires: rpm-ostree >= 2015.10-1
 %else
@@ -405,7 +412,8 @@ The Cockpit components for managing software updates for ostree based systems.
 
 %package sosreport
 Summary: Cockpit user interface for diagnostic reports
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: sos
 BuildArch: noarch
 
@@ -417,7 +425,8 @@ sosreport tool.
 
 %package subscriptions
 Summary: Cockpit subscription user interface package
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: subscription-manager >= 1.13
 BuildArch: noarch
 
@@ -429,7 +438,8 @@ subscription management.
 
 %package networkmanager
 Summary: Cockpit user interface for networking, using NetworkManager
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: NetworkManager
 BuildArch: noarch
 
@@ -444,7 +454,8 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %package selinux
 Summary: Cockpit SELinux package
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: setroubleshoot-server >= 3.3.3
 BuildArch: noarch
 
@@ -460,8 +471,10 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 
 %package docker
 Summary: Cockpit user interface for Docker containers
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: docker >= 1.3.0
+Requires: python
 
 %description docker
 The Cockpit components for interacting with Docker and user interface.
@@ -476,7 +489,8 @@ This package is not yet complete.
 %package kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
 Requires: /usr/bin/kubectl
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 BuildRequires: golang-bin
 BuildRequires: golang-src
 
@@ -494,7 +508,8 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
 
 %package test-assets
 Summary: Additional stuff for testing Cockpit
-Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-bridge >= %{stable_api}
+Requires: %{name}-shell >= %{stable_api}
 Requires: openssh-clients
 
 %description test-assets
@@ -508,6 +523,11 @@ pulls in some necessary packages via dependencies.
 %endif
 
 %changelog
+* Thu Jul 21 2016 Stef Walter <stefw@redhat.com> - 0.115-1
+- * Setup Docker container and image storage through the UI
+- * Use Webpack to build Cockpit UI packages
+- * Update the Cockpit Vagrant development box to use Fedora 24
+
 * Tue Jul 12 2016 Stef Walter <stefw@redhat.com> - 0.114-1
 - .104
 - * Network configuration of the Ethernet MTU

sources

@@ -1 +1 @@
-9adf32b2c403fa6c0e960107b5296381  cockpit-0.114.tar.xz
+4c10d01cdd03bffd430dfd444051aabc  cockpit-0.115.tar.xz