!3 更新版本至0.1.4
From: @weishaokun Reviewed-by: @crrs666 Signed-off-by: @crrs666
This commit is contained in:
commit
123a6b5101
Binary file not shown.
BIN
ovirt-cockpit-sso-0.1.4.tar.gz
Normal file
BIN
ovirt-cockpit-sso-0.1.4.tar.gz
Normal file
Binary file not shown.
@ -1,10 +1,10 @@
|
|||||||
Name: ovirt-cockpit-sso
|
Name: ovirt-cockpit-sso
|
||||||
Version: 0.1.1
|
Version: 0.1.4
|
||||||
Release: 1%{?dist}
|
Release: 1
|
||||||
Summary: Provides SSO from oVirt Administration Portal to Cockpit
|
Summary: Provides SSO from oVirt Administration Portal to Cockpit
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/oVirt/ovirt-cockpit-sso
|
URL: https://github.com/oVirt/%{name}
|
||||||
Source0: https://github.com/oVirt/ovirt-cockpit-sso/archive/%{name}-%{version}.tar.gz
|
Source0: https://resources.ovirt.org/pub/src/%{name}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
%define build_root_dir %{buildroot}%{_datadir}/%{name}
|
%define build_root_dir %{buildroot}%{_datadir}/%{name}
|
||||||
%define app_root_dir %{_datadir}/%{name}
|
%define app_root_dir %{_datadir}/%{name}
|
||||||
@ -15,20 +15,16 @@ BuildArch: noarch
|
|||||||
# None of the 4.2 features are reuiqred by this package but "Host Console" link is introduced here for the first time
|
# None of the 4.2 features are reuiqred by this package but "Host Console" link is introduced here for the first time
|
||||||
# using conflicts instead of require because in CentOS Virt SIG repo we can't build ovirt-engine and the require
|
# using conflicts instead of require because in CentOS Virt SIG repo we can't build ovirt-engine and the require
|
||||||
# breaks repository closure
|
# breaks repository closure
|
||||||
Conflicts: ovirt-engine < 4.2
|
Conflicts: ovirt-engine < 4.4
|
||||||
|
|
||||||
## TODO: increase to 140 once RHEL 7.5 is released
|
## TODO: increase to 140 once RHEL 7.5 is released
|
||||||
## In fact, cockpit 140 is required but this is eased to allow smooth
|
## In fact, cockpit 140 is required but this is eased to allow smooth
|
||||||
## deployment for testing in the meantime
|
## deployment for testing in the meantime
|
||||||
## cockpit 140 is farther enforced in start.sh which is called by systemd
|
## cockpit 140 is farther enforced in start.sh which is called by systemd
|
||||||
%if 0%{?fedora} >= 26
|
|
||||||
## fedora >26 is fine
|
|
||||||
Requires: cockpit-ws >= 140
|
Requires: cockpit-ws >= 140
|
||||||
Requires: cockpit-dashboard >= 140
|
Requires: cockpit-dashboard >= 140
|
||||||
%else
|
|
||||||
Requires: cockpit-ws >= 138
|
Requires: python3
|
||||||
Requires: cockpit-dashboard >= 138
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package sets cockpit-ws service (see cockpit-project.org) to provide
|
This package sets cockpit-ws service (see cockpit-project.org) to provide
|
||||||
@ -62,7 +58,7 @@ case "$1" in
|
|||||||
echo configuring firewall for ovirt-cockpit-sso service - accept 9986/tcp > %{logfile}
|
echo configuring firewall for ovirt-cockpit-sso service - accept 9986/tcp > %{logfile}
|
||||||
echo Post-installation configuration of %{name} - setting engine FQDN to: ${HOSTNAME} >> %{logfile}
|
echo Post-installation configuration of %{name} - setting engine FQDN to: ${HOSTNAME} >> %{logfile}
|
||||||
|
|
||||||
## /bin/firewall-cmd --permanent --zone=public --new-service-from-file=%{app_root_dir}/ovirt-cockpit-sso.xml
|
## /bin/firewall-cmd --permanent --zone=public --new-service-from-file=%%{app_root_dir}/ovirt-cockpit-sso.xml
|
||||||
/bin/firewall-cmd --permanent --add-port 9986/tcp >> %{logfile}
|
/bin/firewall-cmd --permanent --add-port 9986/tcp >> %{logfile}
|
||||||
/bin/firewall-cmd --reload >> %{logfile}
|
/bin/firewall-cmd --reload >> %{logfile}
|
||||||
;;
|
;;
|
||||||
@ -109,5 +105,5 @@ systemctl daemon-reload
|
|||||||
%config %verify(not md5 size mtime) %{app_root_dir}/config/cockpit/cockpit.conf
|
%config %verify(not md5 size mtime) %{app_root_dir}/config/cockpit/cockpit.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Mar 3 2020 changjie.fu <changjie.fu@cs2c.com.cn> - 0.1.1
|
* Tue Jul 06 2021 weishaokun <weishaokun@kylinos.cn> - 0.1.4
|
||||||
- Package Initialization
|
- update package
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user