pvolpe pushed to cockpit (master). "Update to 0.48 release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Mar 30 20:56:10 UTC 2015
>From 100cc73a65f429e35560de55392580cb4bcd7a79 Mon Sep 17 00:00:00 2001
From: petervo <petervo at redhat.com>
Date: Mon, 30 Mar 2015 13:41:04 -0700
Subject: Update to 0.48 release
diff --git a/cockpit.spec b/cockpit.spec
index 69947e5..59a6803 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -23,7 +23,7 @@ Name: cockpit
%if %{defined gitcommit}
Version: %{gitcommit}
%else
-Version: 0.47
+Version: 0.48
%endif
Release: 1%{?dist}
Summary: A user interface for Linux servers
@@ -43,7 +43,6 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(udisks2) >= 2.1.0
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
-BuildRequires: pkgconfig(accountsservice) >= 0.6.35
BuildRequires: pam-devel
BuildRequires: autoconf automake
@@ -114,8 +113,8 @@ Requires: realmd
Requires: storaged
%description daemon
-Summary: Deprecated wrappers for various configuration APIs such as udisks2
-and accountsservice. Soon these will be accessed directly from the cockpit
+Summary: Deprecated wrappers for various configuration APIs such as udisks2.
+Soon these will be accessed directly from the cockpit
user interface, and this package will disappear.
%package doc
@@ -139,7 +138,6 @@ Summary: Cockpit Shell user interface package
Requires: %{name}-bridge = %{version}-%{release}
Requires: NetworkManager
Requires: shadow-utils
-Requires: expect
Requires: grep
Requires: /usr/bin/date
Provides: %{name}-assets
@@ -211,13 +209,22 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
# Build the package lists for resource packages
find %{buildroot}%{_datadir}/%{name}/base1 %{buildroot}%{_datadir}/%{name}/legacy %{buildroot}%{_datadir}/%{name}/shell %{buildroot}%{_datadir}/%{name}/system -type f > shell.list
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f > subscriptions.list
+
%ifnarch x86_64 armv7hl
rm -rf %{buildroot}/%{_datadir}/%{name}/docker
+%endif # x86_64 armv7hl
+
+%ifnarch x86_64
rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
-%else
+%endif #x86_64
+
+%ifarch x86_64 armv7hl
find %{buildroot}%{_datadir}/%{name}/docker -type f > docker.list
+%ifarch x86_64
find %{buildroot}%{_datadir}/%{name}/kubernetes -type f > kubernetes.list
-%endif
+%endif # x86_64
+%endif # x86_64 armv7hl
+
sed -i "s|%{buildroot}||" *.list
# Build the package lists for debug package
@@ -323,6 +330,7 @@ This package is not yet complete.
%files docker -f docker.list
%dir %{_datadir}/%{name}/docker
+%ifarch x86_64
%package kubernetes
Summary: Cockpit user interface for Kubernetes cluster
Requires: kubernetes
@@ -333,8 +341,8 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
%files kubernetes -f kubernetes.list
%dir %{_datadir}/%{name}/kubernetes
-
-%endif
+%endif # x86_64
+%endif # x86_64 armv7hl
%if %{defined gitcommit}
@@ -392,6 +400,12 @@ fi
%endif
%changelog
+* Mon Mar 30 2015 Peter <petervo at redhat.com> - 0.48-1
+- Update to 0.48 release
+
+* Mon Mar 30 2015 Stephen Gallagher <sgallagh at redhat.com> 0.47-2
+- Don't attempt to build cockpit-kubernetes on armv7hl
+
* Fri Mar 27 2015 Peter <petervo at redhat.com> - 0.47-1
- Update to 0.47 release, build docker on armvrhl
diff --git a/sources b/sources
index 7b49bfc..0484d7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2b22efca612d26be82b7d0d11651f50d cockpit-0.47.tar.bz2
+aabd9cdb547fc9a05ea1beeac6b5ef84 cockpit-0.48.tar.bz2
6299c6f81e83b8e5c9d45008e2e4da63 cockpit.pam
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cockpit.git/commit/?h=master&id=100cc73a65f429e35560de55392580cb4bcd7a79
More information about the scm-commits
mailing list