Update to 0.41 release

This commit is contained in:
Stef Walter 2015-03-04 16:17:59 +01:00
parent 0bc83faa85
commit 4f5ad7b885
2 changed files with 28 additions and 6 deletions

View File

@ -4,7 +4,7 @@
# Our SELinux policy gets built in tests and f21 and lower # Our SELinux policy gets built in tests and f21 and lower
%if %{defined gitcommit} %if %{defined gitcommit}
%define extra_flags CFLAGS='-O2 -Wall -Werror' %define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC'
%define selinux 1 %define selinux 1
%endif %endif
%if 0%{?fedora} > 0 && 0%{?fedora} <= 21 %if 0%{?fedora} > 0 && 0%{?fedora} <= 21
@ -18,7 +18,7 @@ Name: cockpit
%if %{defined gitcommit} %if %{defined gitcommit}
Version: %{gitcommit} Version: %{gitcommit}
%else %else
Version: 0.40 Version: 0.41
%endif %endif
Release: 1%{?dist} Release: 1%{?dist}
Summary: A user interface for Linux servers Summary: A user interface for Linux servers
@ -52,6 +52,8 @@ BuildRequires: docbook-style-xsl
BuildRequires: keyutils-libs-devel BuildRequires: keyutils-libs-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: glib-networking BuildRequires: glib-networking
BuildRequires: glib2-devel >= 2.37.4
BuildRequires: systemd BuildRequires: systemd
BuildRequires: polkit BuildRequires: polkit
BuildRequires: pcp-libs-devel BuildRequires: pcp-libs-devel
@ -137,6 +139,8 @@ This package contains the Cockpit shell UI assets.
%package ws %package ws
Summary: Cockpit Web Service Summary: Cockpit Web Service
Requires: glib-networking Requires: glib-networking
Requires: glib2 >= 2.37.4
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
@ -170,6 +174,8 @@ make selinux
make install-test-assets DESTDIR=%{buildroot} make install-test-assets DESTDIR=%{buildroot}
mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d
cp src/bridge/polkit-workarounds.rules %{buildroot}/%{_datadir}/polkit-1/rules.d cp src/bridge/polkit-workarounds.rules %{buildroot}/%{_datadir}/polkit-1/rules.d
%else
rm -rf %{buildroot}/%{_datadir}/%{name}/playground
%endif %endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
@ -181,6 +187,7 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
%endif %endif
%ifnarch x86_64 %ifnarch x86_64
rm -rf %{buildroot}/%{_datadir}/%{name}/docker rm -rf %{buildroot}/%{_datadir}/%{name}/docker
rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
%endif %endif
%files %files
@ -217,10 +224,10 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/docker
( cd /var/lib/pcp/pmns && ./Rebuild -du ) ( cd /var/lib/pcp/pmns && ./Rebuild -du )
%files shell %files shell
%{_datadir}/%{name}/base %{_datadir}/%{name}/base1
%{_datadir}/%{name}/legacy
%{_datadir}/%{name}/shell %{_datadir}/%{name}/shell
%{_datadir}/%{name}/playground %{_datadir}/%{name}/system
%{_datadir}/%{name}/server-systemd
%files ws %files ws
%doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man5/cockpit.conf.5.gz
@ -266,6 +273,17 @@ This package is not yet complete.
%files docker %files docker
%{_datadir}/%{name}/docker %{_datadir}/%{name}/docker
%package kubernetes
Summary: Cockpit user interface for Kubernetes cluster
Requires: kubernetes
%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
%{_datadir}/%{name}/kubernetes
%endif %endif
%if %{defined gitcommit} %if %{defined gitcommit}
@ -279,6 +297,7 @@ This package contains programs and other files for testing Cockpit, and
pulls in some necessary packages via dependencies. pulls in some necessary packages via dependencies.
%files test-assets %files test-assets
%{_datadir}/%{name}/playground
%{_datadir}/cockpit-test-assets %{_datadir}/cockpit-test-assets
%{_datadir}/polkit-1/rules.d %{_datadir}/polkit-1/rules.d
/usr/lib/systemd/system/cockpit-testing.service /usr/lib/systemd/system/cockpit-testing.service
@ -323,6 +342,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Mar 04 2015 Stef Walter <stefw@redhat.com> - 0.41-1
- Update to 0.41 release
* Thu Feb 26 2015 Stef Walter <stefw@redhat.com> - 0.40-1 * Thu Feb 26 2015 Stef Walter <stefw@redhat.com> - 0.40-1
- Update to 0.40 release - Update to 0.40 release

View File

@ -1 +1 @@
b4d116d0a05ad1f075c50273e23c1393 cockpit-0.40.tar.bz2 bfae44b880f23177e42b2421789897df cockpit-0.41.tar.bz2