From 0b925ffb284f784f4265122bde790d344f1ef1f2 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 7 Apr 2015 09:56:11 +0200 Subject: [PATCH] Update to 0.50 release --- cockpit.spec | 134 ++++++++++++++++++++++++++++++++------------------- sources | 3 +- 2 files changed, 86 insertions(+), 51 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 1566af5..b8490c2 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -18,14 +18,17 @@ %if 0%{?rhel} %define selinux 1 %endif +%if 0%{?centos} +%define rhel 0 +%endif Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else -Version: 0.49 +Version: 0.50 %endif -Release: 2%{?dist} +Release: 1%{?dist} Summary: A user interface for Linux servers License: LGPLv2+ @@ -62,6 +65,11 @@ BuildRequires: systemd BuildRequires: polkit BuildRequires: pcp-libs-devel +# For cockpit-lvm +BuildRequires: libgudev1-devel +BuildRequires: lvm2-devel +BuildRequires: polkit-devel + %if %{defined gitcommit} BuildRequires: npm BuildRequires: nodejs @@ -84,14 +92,9 @@ Requires: %{name}-shell = %{version}-%{release} %ifarch x86_64 armv7hl Requires: %{name}-docker = %{version}-%{release} %endif -%if 0%{?rhel} && 0%{?centos} == 0 +%if 0%{?rhel} Requires: %{name}-subscriptions = %{version}-%{release} %endif -%if %{defined selinux} -Requires: %{name}-selinux-policy = %{version}-%{release} -%endif -Provides: %{name}-daemon -Obsoletes: %{name}-daemon < 0.48-2 %description Cockpit runs in a browser and can manage your network of GNU/Linux @@ -99,6 +102,9 @@ machines. %package bridge Summary: Cockpit bridge server-side component +Provides: %{name}-daemon +Obsoletes: %{name}-daemon < 0.48-2 +Requires: polkit %description bridge The Cockpit bridge component installed server side and runs commands on the @@ -127,11 +133,19 @@ Requires: NetworkManager Requires: shadow-utils Requires: grep Requires: /usr/bin/date -Requires: udisks2 >= 2.1.0 Requires: mdadm Requires: lvm2 +%if 0%{?rhel} == 0 +Requires: udisks2 >= 2.1.0 Requires: realmd -Requires: storaged +%else +Provides: %{name}-subscriptions = %{version}-%{release} +Requires: subscription-manager >= 1.13 +%ifarch x86_64 armv7hl +Provides: %{name}-docker = %{version}-%{release} +Requires: docker +%endif +%endif Provides: %{name}-assets Obsoletes: %{name}-assets < 0.32 BuildArch: noarch @@ -139,19 +153,10 @@ BuildArch: noarch %description shell This package contains the Cockpit shell UI assets. -%package subscriptions -Summary: Cockpit subscription user interface package -Requires: subscription-manager >= 1.13 -BuildArch: noarch - -%description subscriptions -This package contains the Cockpit user interface integration with local -subscription management. - %package ws Summary: Cockpit Web Service Requires: glib-networking - +Requires: openssl Requires: glib2 >= 2.37.4 Requires(post): systemd Requires(preun): systemd @@ -199,34 +204,50 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/ %endif # Build the package lists for resource packages -find %{buildroot}%{_datadir}/%{name}/base1 %{buildroot}%{_datadir}/%{name}/legacy %{buildroot}%{_datadir}/%{name}/shell %{buildroot}%{_datadir}/%{name}/system %{buildroot}%{_datadir}/%{name}/domain -type f > shell.list -find %{buildroot}%{_datadir}/%{name}/subscriptions -type f > subscriptions.list +echo '%dir %{_datadir}/%{name}/base1' > shell.list +find %{buildroot}%{_datadir}/%{name}/base1 -type f >> shell.list -%ifnarch x86_64 armv7hl -rm -rf %{buildroot}/%{_datadir}/%{name}/docker -%endif # x86_64 armv7hl +echo '%dir %{_datadir}/%{name}/shell' >> domain.list +find %{buildroot}%{_datadir}/%{name}/domain -type f >> shell.list -%ifnarch x86_64 -rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes -%endif #x86_64 +echo '%dir %{_datadir}/%{name}/shell' >> shell.list +find %{buildroot}%{_datadir}/%{name}/shell -type f >> shell.list + +echo '%dir %{_datadir}/%{name}/system' >> shell.list +find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list + +echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list +find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> subscriptions.list %ifarch x86_64 armv7hl -find %{buildroot}%{_datadir}/%{name}/docker -type f > docker.list +echo '%dir %{_datadir}/%{name}/docker' > docker.list +find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list +%else +rm -rf %{buildroot}/%{_datadir}/%{name}/docker +touch docker.list +%endif + %ifarch x86_64 -find %{buildroot}%{_datadir}/%{name}/kubernetes -type f > kubernetes.list -%endif # x86_64 -%endif # x86_64 armv7hl +echo '%dir %{_datadir}/%{name}/kubernetes' > kubernetes.list +find %{buildroot}%{_datadir}/%{name}/kubernetes -type f >> kubernetes.list +%else +rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes +touch kubernetes.list +%endif sed -i "s|%{buildroot}||" *.list -# Build the package lists for debug package +# Build the package lists for debug package, and move debug files to installed locations find %{buildroot}/debug%{_datadir}/%{name} -type f -o -type l > debug.list sed -i "s|%{buildroot}/debug||" debug.list - -# Move the debug files into place mixed in with the other files tar -C %{buildroot}/debug -cf - . | tar -C %{buildroot} -xf - rm -rf %{buildroot}/debug +# On RHEL subscriptions and docker are part of the shell package +%if 0%{?rhel} +cat subscriptions.list docker.list >> shell.list +%endif + # Redefine how debug info is built to slip in our extra debug files %define __debug_install_post \ %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" \ @@ -247,8 +268,14 @@ rm -rf %{buildroot}/debug %{_bindir}/cockpit-bridge %attr(4755, -, -) %{_libexecdir}/cockpit-polkit %{_libexecdir}/cockpit-wrapper +%{_libexecdir}/cockpit-lvm +%{_libexecdir}/cockpit-lvm-helper %{_libdir}/security/pam_reauthorize.so %{_datadir}/dbus-1/services/com.redhat.Cockpit.service +%{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.LVM.conf +%{_datadir}/dbus-1/system-services/com.redhat.Cockpit.LVM.service +%{_datadir}/polkit-1/actions/com.redhat.Cockpit.LVM.policy +%{_datadir}/cockpit/lvm-nolocking/lvm.conf %files doc %exclude %{_docdir}/%{name}/AUTHORS @@ -264,16 +291,6 @@ rm -rf %{buildroot}/debug ( cd /var/lib/pcp/pmns && ./Rebuild -du ) %files shell -f shell.list -%dir %{_datadir}/%{name}/base1 -%dir %{_datadir}/%{name}/base1/fonts -%dir %{_datadir}/%{name}/base1/images -%dir %{_datadir}/%{name}/legacy -%dir %{_datadir}/%{name}/shell -%dir %{_datadir}/%{name}/shell/images -%dir %{_datadir}/%{name}/system - -%files subscriptions -f subscriptions.list -%dir %{_datadir}/%{name}/subscriptions %files ws %doc %{_mandir}/man5/cockpit.conf.5.gz @@ -306,6 +323,19 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true # Conditionally built packages below +%if 0%{?rhel} == 0 + +%package subscriptions +Summary: Cockpit subscription user interface package +Requires: subscription-manager >= 1.13 +BuildArch: noarch + +%description subscriptions +This package contains the Cockpit user interface integration with local +subscription management. + +%files subscriptions -f subscriptions.list + %ifarch x86_64 armv7hl %package docker @@ -317,9 +347,13 @@ The Cockpit components for interacting with Docker and user interface. This package is not yet complete. %files docker -f docker.list -%dir %{_datadir}/%{name}/docker + +%endif + +%endif %ifarch x86_64 + %package kubernetes Summary: Cockpit user interface for Kubernetes cluster Requires: kubernetes @@ -329,9 +363,8 @@ 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 -%dir %{_datadir}/%{name}/kubernetes -%endif # x86_64 -%endif # x86_64 armv7hl + +%endif %if %{defined gitcommit} @@ -389,6 +422,9 @@ fi %endif %changelog +* Tue Apr 07 2015 Stef Walter 0.50-1 +- Update to 0.50 release + * Wed Apr 01 2015 Stephen Gallagher 0.49-2 - Fix incorrect Obsoletes: of cockpit-daemon diff --git a/sources b/sources index b0ba896..0089bc6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -eb83e5b5b795e0a56dccbcacc1139492 cockpit-0.49.tar.bz2 -6299c6f81e83b8e5c9d45008e2e4da63 cockpit.pam +9e7c1e4805be29ad9f5e2a7ae96f53c1 cockpit-0.50.tar.bz2