From 0bd019ce47ec6dd5b3097b3fe0e5c448fe972457 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 05 2015 20:59:19 +0000 Subject: import cockpit-0.63-1.el7 --- diff --git a/.cockpit.metadata b/.cockpit.metadata index 2aae7ae..e4693a5 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -fcc7398a5f9a7787d272f20969d5cb61a5dce072 SOURCES/cockpit-0.58.tar.bz2 +bebdfe5f5156c71acd3f09958a6a807fd0fe3e91 SOURCES/cockpit-0.63.tar.bz2 diff --git a/.gitignore b/.gitignore index 0722740..e03dfea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-0.58.tar.bz2 +SOURCES/cockpit-0.63.tar.bz2 diff --git a/SOURCES/branding-full-logo.patch b/SOURCES/branding-full-logo.patch deleted file mode 100644 index f790394..0000000 --- a/SOURCES/branding-full-logo.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8677e511ef32d143b81b83ebb1f7602612a8bec9 Mon Sep 17 00:00:00 2001 -From: Andreas Nilsson -Date: Mon, 25 May 2015 16:30:12 +0200 -Subject: [PATCH] branding: Look for the full wordmark logos for Fedora and - RHEL - -Instead of just the square logo - -Closes #2343 -Reviewed-by: Stef Walter ---- - branding/fedora/Makefile.am | 2 +- - branding/fedora/branding.css | 4 ++-- - branding/rhel/Makefile.am | 2 +- - branding/rhel/branding.css | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/branding/fedora/Makefile.am b/branding/fedora/Makefile.am -index 52f03e8..9735066 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -8530,11 +8530,11 @@ - # Opportunistically use fedora-logos - install-data-hook:: -- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(fedorabrandingdir)/logo.png -+ $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(fedorabrandingdir)/logo.png - $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(fedorabrandingdir)/apple-touch-icon.png - $(LN_S) -f /etc/favicon.png $(DESTDIR)$(fedorabrandingdir)/favicon.ico - - # Opportunistically use redhat-logos ... yes they're called 'fedora' - install-data-hook:: -- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(rhelbrandingdir)/logo.png -+ $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(rhelbrandingdir)/logo.png - $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(rhelbrandingdir)/apple-touch-icon.png - $(LN_S) -f /etc/favicon.png $(DESTDIR)$(rhelbrandingdir)/favicon.ico -diff --git a/branding/fedora/branding.css b/branding/fedora/branding.css -index 96acb6e..0e8fa7d 100644 ---- a/branding/fedora/branding.css -+++ b/branding/fedora/branding.css -@@ -5,8 +5,8 @@ body.login-pf { - } - - #badge { -- width: 64px; -- height: 64px; -+ width: 225px; -+ height: 80px; - background-image: url("/cockpit/static/logo.png"); - background-size: contain; - } -diff --git a/branding/rhel/branding.css b/branding/rhel/branding.css -index 60cd016..5e8434c 100644 ---- a/branding/rhel/branding.css -+++ b/branding/rhel/branding.css -@@ -11,8 +11,8 @@ body.login-pf { - } - - #badge { -- width: 64px; -- height: 64px; -+ width: 225px; -+ height: 80px; - background-image: url("/cockpit/static/logo.png"); - background-size: contain; - } --- -2.4.1 - diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index e77606a..c21ff88 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -26,9 +26,9 @@ Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else -Version: 0.58 +Version: 0.63 %endif -Release: 2%{?dist} +Release: 1%{?dist} Summary: A user interface for Linux servers License: LGPLv2+ @@ -40,7 +40,6 @@ Source0: cockpit-%{version}.tar.gz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.bz2 %endif Source1: cockpit.pam -Patch10: branding-full-logo.patch BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -90,7 +89,7 @@ BuildRequires: xmlto Requires: %{name}-bridge = %{version}-%{release} Requires: %{name}-ws = %{version}-%{release} Requires: %{name}-shell = %{version}-%{release} -%ifarch x86_64 armv7hl +%ifarch x86_64 Requires: %{name}-docker = %{version}-%{release} %endif %if 0%{?rhel} @@ -142,7 +141,7 @@ Requires: udisks2 >= 2.1.0 %else Provides: %{name}-subscriptions = %{version}-%{release} Requires: subscription-manager >= 1.13 -%ifarch x86_64 armv7hl +%ifarch x86_64 Provides: %{name}-docker = %{version}-%{release} Requires: docker Provides: %{name}-kubernetes = %{version}-%{release} @@ -169,7 +168,6 @@ The Cockpit Web Service listens on the network, and authenticates users. %prep %setup -q -%patch10 -p 1 %if 0%{?fedora} == 20 sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in %endif @@ -360,7 +358,7 @@ subscription management. %package docker Summary: Cockpit user interface for Docker containers -Requires: docker +Requires: docker >= 1.3.0 %description docker The Cockpit components for interacting with Docker and user interface. @@ -442,6 +440,9 @@ fi %endif %changelog +* Mon Jul 06 2015 Stef Walter - 0.63-1 +- Update to 0.63 release rhbz#1239086 + * Mon May 25 2015 Stef Walter - 0.58-2 - Fix choice of logo for RHEL and Fedora branding