diff --git a/ovirt-cockpit-sso-0.1.1.tar.gz b/ovirt-cockpit-sso-0.1.1.tar.gz deleted file mode 100644 index 27499f7..0000000 Binary files a/ovirt-cockpit-sso-0.1.1.tar.gz and /dev/null differ diff --git a/ovirt-cockpit-sso-0.1.4.tar.gz b/ovirt-cockpit-sso-0.1.4.tar.gz new file mode 100644 index 0000000..a08828c Binary files /dev/null and b/ovirt-cockpit-sso-0.1.4.tar.gz differ diff --git a/ovirt-cockpit-sso.spec b/ovirt-cockpit-sso.spec index 0136638..3430b6b 100644 --- a/ovirt-cockpit-sso.spec +++ b/ovirt-cockpit-sso.spec @@ -1,10 +1,10 @@ Name: ovirt-cockpit-sso -Version: 0.1.1 -Release: 1%{?dist} +Version: 0.1.4 +Release: 1 Summary: Provides SSO from oVirt Administration Portal to Cockpit License: ASL 2.0 -URL: https://github.com/oVirt/ovirt-cockpit-sso -Source0: https://github.com/oVirt/ovirt-cockpit-sso/archive/%{name}-%{version}.tar.gz +URL: https://github.com/oVirt/%{name} +Source0: https://resources.ovirt.org/pub/src/%{name}/%{name}-%{version}.tar.gz %define build_root_dir %{buildroot}%{_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 # using conflicts instead of require because in CentOS Virt SIG repo we can't build ovirt-engine and the require # breaks repository closure -Conflicts: ovirt-engine < 4.2 +Conflicts: ovirt-engine < 4.4 ## TODO: increase to 140 once RHEL 7.5 is released ## In fact, cockpit 140 is required but this is eased to allow smooth ## deployment for testing in the meantime ## 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-dashboard >= 140 -%else -Requires: cockpit-ws >= 138 -Requires: cockpit-dashboard >= 138 -%endif + +Requires: python3 %description 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 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 --reload >> %{logfile} ;; @@ -109,5 +105,5 @@ systemctl daemon-reload %config %verify(not md5 size mtime) %{app_root_dir}/config/cockpit/cockpit.conf %changelog -* Tue Mar 3 2020 changjie.fu - 0.1.1 -- Package Initialization +* Tue Jul 06 2021 weishaokun - 0.1.4 +- update package