diff --git a/.gitignore b/.gitignore index 75d791b..c8ce626 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /cockpit-0.93.tar.xz /cockpit-0.94.tar.xz /cockpit-0.95.tar.xz +/cockpit-0.102.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 04a4aa7..13477bc 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,4 @@ -%define tag 0.95 +%define tag 0.102 %define rev 1 # # This file is maintained at the following location: @@ -14,12 +14,10 @@ # * tag 0.91 # -%define branding auto %define rev 1 %if %{defined gitcommit} %define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g -DWITH_DEBUG' -%define branding default %endif %if 0%{?centos} @@ -98,6 +96,7 @@ Recommends: %{name}-docker = %{version}-%{release} %endif Suggests: %{name}-pcp = %{version}-%{release} Suggests: %{name}-kubernetes = %{version}-%{release} +Suggests: %{name}-selinux = %{version}-%{release} # Older releases need to have strict requirements %else @@ -162,7 +161,7 @@ exec 2>&1 %if %{defined gitcommit} env NOCONFIGURE=1 ./autogen.sh %endif -%configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding} --with-selinux-config-type=etc_t +%configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=auto --with-selinux-config-type=etc_t make -j4 %{?extra_flags} all %check @@ -181,9 +180,6 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/ -# This is not yet packaged -rm -rf %{buildroot}%{_datadir}/%{name}/registry - # On RHEL we don't yet show options for changing language %if 0%{?rhel} echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name}/shell/override.json @@ -226,6 +222,14 @@ find %{buildroot}%{_datadir}/%{name}/network -type f >> networkmanager.list echo '%dir %{_datadir}/%{name}/ostree' > ostree.list find %{buildroot}%{_datadir}/%{name}/ostree -type f >> ostree.list +# on RHEL systems we don't have the required setroubleshoot-server packages +%if 0%{?rhel} +rm -rf %{buildroot}%{_datadir}/%{name}/selinux +%else +echo '%dir %{_datadir}/%{name}/selinux' > selinux.list +find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list +%endif + %ifarch x86_64 armv7hl echo '%dir %{_datadir}/%{name}/docker' > docker.list find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list @@ -235,6 +239,10 @@ touch docker.list %endif %ifarch x86_64 +%if %{defined gitcommit} +%else +rm %{buildroot}/%{_datadir}/%{name}/kubernetes/override.json +%endif echo '%dir %{_datadir}/%{name}/kubernetes' > kubernetes.list find %{buildroot}%{_datadir}/%{name}/kubernetes -type f >> kubernetes.list %else @@ -255,6 +263,10 @@ rm -rf %{buildroot}/usr/src/debug cat subscriptions.list sosreport.list networkmanager.list >> shell.list %endif +# dwz has trouble with the go binaries +# 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} @@ -376,10 +388,10 @@ The Cockpit component for managing storage. This package uses Storaged. %package ostree Summary: Cockpit user interface for rpm-ostree -%if 0%{?rhel} -Requires: rpm-ostree-client >= 2015.11-1 -%else +%if 0%{?fedora} > 0 && 0%{?fedora} < 24 Requires: rpm-ostree >= 2015.10-1 +%else +Requires: /usr/libexec/rpm-ostreed %endif %description ostree @@ -413,6 +425,17 @@ subscription management. %files subscriptions -f subscriptions.list +%package selinux +Summary: Cockpit SELinux package +Requires: setroubleshoot-server >= 3.3.3 +BuildArch: noarch + +%description selinux +This package contains the Cockpit user interface integration with the +utility setroubleshoot to diagnose and resolve SELinux issues. + +%files selinux -f selinux.list + %package networkmanager Summary: Cockpit user interface for networking, using NetworkManager Requires: NetworkManager @@ -444,12 +467,17 @@ This package is not yet complete. %package kubernetes Summary: Cockpit user interface for Kubernetes cluster Requires: /usr/bin/kubectl +Requires: %{name}-shell = %{version}-%{release} +BuildRequires: golang-bin +BuildRequires: golang-src %description kubernetes The Cockpit components for visualizing and configuring a Kubernetes cluster. Installed on the Kubernetes master. This package is not yet complete. %files kubernetes -f kubernetes.list +%{_libexecdir}/cockpit-kube-auth +%{_libexecdir}/cockpit-kube-launch %endif @@ -466,12 +494,17 @@ pulls in some necessary packages via dependencies. %files test-assets %{_datadir}/%{name}/playground %{_datadir}/cockpit-test-assets -%{_unitdir}/cockpit-testing.service -%{_unitdir}/cockpit-testing.socket %endif %changelog +* Thu Apr 14 2016 Stef Walter - 0.102-1 +- * Can configure Docker restart policy for new containers +- * Use a single dialog for creating logical volumes +- * Package and test the storage UI on Debian +- * Don't offer 'Computer OU' when joining IPA domains +- * Don't distribute jshint build dependency due to its non-free license + * Fri Feb 12 2016 Stef Walter - 0.95-1 - * iSCSI initiator support on the storage page - * Page browser title now uses on operating system name diff --git a/sources b/sources index b350208..e997a97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75c13167e00a7fa3cdad48ad28c5710f cockpit-0.95.tar.xz +13fac39128563654ec808456b7ac9ba8 cockpit-0.102.tar.xz