Upgrade the pcs package version to 0.10.5-1
This commit is contained in:
jiangxinyu
parent
3b88a60ce0
commit
d1d664268b
BIN
HAM-logo.png
BIN
HAM-logo.png
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
63
HAM-logo.svg
63
HAM-logo.svg
@ -1,63 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 170 40" style="enable-background:new 0 0 170 40;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#CF171B;}
|
||||
.st1{fill:#D71718;}
|
||||
</style>
|
||||
<rect x="62.1" y="21.4" class="st0" width="49.1" height="0.6"/>
|
||||
<path class="st0" d="M61.5,12.1l-2.3-4.6h2l0.6,1.6c0.2,0.5,0.4,1,0.6,1.6h0c0.2-0.5,0.4-1,0.7-1.6l0.6-1.6h2l-2.4,4.6v2.5h-1.9
|
||||
V12.1z"/>
|
||||
<polygon class="st0" points="66.6,7.5 68.4,7.5 68.4,13.2 71.5,13.2 71.5,14.6 66.6,14.6 "/>
|
||||
<rect x="72.8" y="7.5" class="st0" width="1.9" height="7"/>
|
||||
<path class="st0" d="M76.5,7.5h1.9l1.9,3.4l0.8,1.6h0.1c-0.1-0.7-0.3-1.8-0.3-2.6V7.5h1.8v7h-1.9l-1.9-3.4l-0.8-1.5H78
|
||||
c0.1,0.8,0.2,1.8,0.2,2.6v2.3h-1.8V7.5z"/>
|
||||
<path class="st0" d="M84,13.7l1.1-1.2c0.6,0.4,1.3,0.7,1.9,0.7c0.7,0,1-0.2,1-0.6c0-0.4-0.4-0.5-1.1-0.8l-1-0.4
|
||||
c-0.8-0.3-1.6-0.9-1.6-1.9c0-1.2,1.2-2.1,2.8-2.1c0.9,0,1.9,0.3,2.5,0.9l-0.9,1.1c-0.5-0.4-1-0.5-1.6-0.5c-0.6,0-0.9,0.2-0.9,0.6
|
||||
c0,0.4,0.5,0.5,1.2,0.8l1,0.4c1,0.3,1.5,0.9,1.5,1.9c0,1.2-1.1,2.2-3,2.2C85.9,14.7,84.8,14.4,84,13.7"/>
|
||||
<path class="st0" d="M90.8,11c0-2.3,1.4-3.6,3.6-3.6c2.1,0,3.6,1.3,3.6,3.6c0,2.3-1.4,3.7-3.6,3.7C92.3,14.7,90.8,13.3,90.8,11
|
||||
M96.1,11c0-1.4-0.6-2.2-1.7-2.2c-1,0-1.7,0.8-1.7,2.2c0,1.4,0.6,2.2,1.7,2.2C95.4,13.2,96.1,12.4,96.1,11"/>
|
||||
<polygon class="st0" points="99.4,7.5 104.4,7.5 104.4,8.9 101.3,8.9 101.3,10.5 104,10.5 104,11.9 101.3,11.9 101.3,14.6
|
||||
99.4,14.6 "/>
|
||||
<polygon class="st0" points="107.3,8.9 105.2,8.9 105.2,7.5 111.3,7.5 111.3,8.9 109.1,8.9 109.1,14.6 107.3,14.6 "/>
|
||||
<path class="st0" d="M46.6,32.7c0,2.2-0.2,5.2-1.1,7c-0.3-0.3-0.9-0.7-1.2-0.8c0.8-1.8,0.9-4.4,0.9-6.4v-6.9H48
|
||||
c-0.1-0.4-0.3-0.9-0.4-1.2l1.8-0.4c0.3,0.5,0.5,1.1,0.6,1.6h2.3v1.6h-2.1v1.1h2v4.4H46.6z M52.2,37c0,0.4,0.1,1,0.1,1.4
|
||||
c-2.1,0.7-2.6,0.9-2.9,1.1c-0.1-0.2-0.2-0.5-0.3-0.9c-1.6,0.5-2,0.7-2.2,0.9l0-0.1c-0.1-0.4-0.3-1-0.5-1.2c0.2-0.1,0.5-0.4,0.5-1
|
||||
v-4.2h1.3v1.4h1v1.5h-1v1.7l0.9-0.2c0,0.2,0,0.5,0,0.8c0.2-0.2,0.4-0.4,0.4-0.9V33h1.3v1.3h1.2v1.5h-1.2v1.6L52.2,37z M46.6,28.3
|
||||
h0.7v-1.1h-0.7V28.3z M47.3,29.7h-0.7v1.5h0.7V29.7z M49.2,27.2h-0.7v1.1h0.7V27.2z M48.4,31.2h0.7v-1.5h-0.7V31.2z M50.3,31.2H51
|
||||
v-1.5h-0.7V31.2z M56.1,36.5c-0.6,1.3-1.5,2.6-2.4,3.5c-0.3-0.3-1-0.9-1.4-1.2c0.9-0.7,1.7-1.7,2.1-2.8L56.1,36.5z M60.4,34.1v1.7
|
||||
h-7.7v-1.7h1v-6.2h-1v-1.7h1V24h1.7v2.2h2.2V24h1.7v2.2h1v1.7h-1v6.2H60.4z M55.4,28.9h2.2v-1h-2.2V28.9z M55.4,31.5h2.2v-1h-2.2
|
||||
V31.5z M55.4,34.1h2.2v-1.1h-2.2V34.1z M58.3,35.9c0.7,0.9,1.6,2.2,2,3.1l-1.6,0.9c-0.3-0.9-1.2-2.2-1.9-3.2L58.3,35.9z"/>
|
||||
<path class="st0" d="M76.6,36.1h0.9v1.5h-0.9v2.3h-1.4v-2.3h-1.7v0h-0.7c0.2-0.8,0.4-2.1,0.5-3.1l1.3,0.1c-0.1,0.5-0.2,1-0.3,1.5
|
||||
h0.9v-1.9h-1.8v-1.5h1.8v-1.5h1c-0.7-0.5-1.4-1.3-2-2.2v2.6h-1.6v-2.5c-0.5,0.8-1.1,1.5-1.8,2l0.6,0.1c-0.1,0.4-0.1,0.7-0.2,1.1h1
|
||||
l0.3,0l0.8,0.2c-0.4,3.6-1.5,6-3.4,7.3c-0.2-0.3-0.5-0.9-0.8-1.2c0.6-0.4,1.2-1,1.6-1.8c-0.3-0.3-0.6-0.6-0.9-0.9l0.9-1.1
|
||||
c0.2,0.2,0.4,0.3,0.6,0.5c0.2-0.5,0.3-1.1,0.4-1.7h-1c-0.3,1-0.8,1.9-1.3,2.6c-0.1-0.2-0.4-0.4-0.6-0.7v0.1h-0.9v1.8l1-0.3
|
||||
c0,0.4,0.1,1,0.2,1.2c-1.8,0.7-2.2,0.9-2.4,1.1c-0.1-0.3-0.4-0.7-0.7-1c-1.4,0.6-1.7,0.8-1.9,1c-0.1-0.3-0.5-0.8-0.7-1
|
||||
c0.3-0.2,0.6-0.7,0.6-1.5v-4.1h1.3v1.4h1v1.4h-1v1.8l0.9-0.3c0,0.2,0.1,0.5,0.1,0.8c0.2-0.3,0.3-0.6,0.3-1.1v-4.1h1.3v1.4h0.9V35
|
||||
c0.6-1,1-2.3,1.3-3.7c-0.2-0.3-0.6-0.7-0.8-0.9v2.3h-5.6c0,2.3-0.2,5.4-1.1,7.3c-0.3-0.3-0.9-0.7-1.2-0.9c0.8-1.8,0.9-4.4,0.9-6.5
|
||||
v-7h2.9c-0.2-0.4-0.3-0.9-0.5-1.2l1.6-0.4c0.3,0.5,0.6,1.1,0.7,1.6h2.4v1.6h-5.7v1.1h0.7v-0.9h1.2v0.9h0.7v-0.9h1.1v0.9h2v1.9
|
||||
c0.8-0.4,1.6-1.1,2.2-1.8h-1.8v-1.6h1.1c-0.2-0.6-0.6-1.3-0.9-1.9l1.3-0.5c0.5,0.6,0.9,1.4,1.1,2l-1,0.4h1.4V24h1.6v2.8h1.5
|
||||
l-1.1-0.5c0.3-0.5,0.7-1.4,1-2.1l1.6,0.6c-0.5,0.7-0.9,1.4-1.2,2h1.2v1.6h-1.8c0.6,0.7,1.5,1.3,2.3,1.7c-0.3,0.3-0.8,0.7-1.1,1.1
|
||||
h0.1v1.5h0.7v1.5h-0.7V36.1z M63.6,31.2h0.7v-1.4h-0.7V31.2z M65.4,31.2h0.7v-1.4h-0.7V31.2z M68,29.8h-0.7v1.4H68V29.8z"/>
|
||||
<path class="st0" d="M86.2,36c-0.6,0.1-1.3,0.2-2,0.3v3.5h-1.8v-3.2l-3.6,0.6l-0.4-2c1.1-0.1,2.5-0.3,4-0.5v-1.8h-1.6
|
||||
c-0.6,0-1.2,0.1-1.4,0.3c-0.1-0.4-0.4-1.2-0.6-1.7c0.4-0.1,0.6-0.6,1-1.3c0.2-0.4,0.5-1.2,0.9-2.3h-1.9v-1.9h2.5
|
||||
c0.2-0.6,0.3-1.2,0.4-1.8l2,0.4c-0.1,0.5-0.2,1-0.4,1.4h2.9v1.9h-3.5c-0.4,1.2-0.9,2.3-1.3,3.3h1.2v-2.3h1.8v2.3h1.7l0,1.8h-1.7v1.6
|
||||
l1.9-0.3L86.2,36z M90.8,30.6c0,0.5,0,1.1-0.1,1.7c0.6,2.6,1.8,4.9,3.8,5.9c-0.4,0.4-1.1,1.2-1.3,1.7c-1.5-0.9-2.6-2.3-3.3-4.2
|
||||
c-0.6,1.5-1.5,3-3.1,4.2c-0.3-0.4-1-1.1-1.5-1.4c3.3-2.5,3.6-5.9,3.6-8v-0.8h1.9V30.6z M88.7,28.2c-0.4,1.4-0.9,2.6-1.6,3.5
|
||||
c-0.3-0.3-1.2-0.9-1.6-1.2c1.2-1.5,1.8-4,2.1-6.6l1.9,0.3c-0.1,0.7-0.2,1.4-0.4,2.2h3.6l0.3-0.1l1.3,0.3c-0.3,1.7-0.8,3.6-1.1,4.8
|
||||
l-1.6-0.4c0.2-0.7,0.4-1.8,0.6-2.9H88.7z"/>
|
||||
<path class="st0" d="M101,24.7c-0.5,1.2-1,2.5-1.7,3.6v11.6h-1.9v-8.6c-0.3,0.4-0.7,0.9-1,1.2c-0.2-0.5-0.7-1.6-1.1-2.1
|
||||
c1.5-1.5,2.9-3.9,3.8-6.4L101,24.7z M111.3,34.2H107v5.7h-2v-5.7h-4.6v-2h4.6v-2.9h-2.1c-0.3,0.8-0.7,1.6-1.1,2.2
|
||||
c-0.4-0.3-1.3-0.7-1.8-1c0.9-1.3,1.6-3.5,2-5.6l2,0.4c-0.1,0.7-0.3,1.3-0.5,2h1.4v-3.1h2v3.1h3.6v2H107v2.9h4.4V34.2z"/>
|
||||
<polygon class="st0" points="54.2,11.1 63.7,0.7 64.3,0.1 58.1,0.1 49.9,8.6 49.9,2.8 49.9,0 49.9,0 49.9,0 44.7,0 44.7,22 44.7,22
|
||||
44.7,22 49.9,22 49.9,22 49.9,19.3 49.9,13.4 58.1,22 64.3,22 63.7,21.4 "/>
|
||||
<g>
|
||||
<path class="st1" d="M114.7,3.3c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5c0.8,0,1.5,0.7,1.5,1.5
|
||||
C116.2,2.6,115.5,3.3,114.7,3.3 M114.7,0c-1,0-1.8,0.8-1.8,1.8c0,1,0.8,1.8,1.8,1.8c1,0,1.8-0.8,1.8-1.8C116.5,0.8,115.7,0,114.7,0
|
||||
"/>
|
||||
<path class="st1" d="M114.4,1.1v0.5h0.4c0.2,0,0.3-0.1,0.3-0.3c0-0.2-0.1-0.2-0.3-0.2H114.4z M114.4,1.9v0.7H114V0.8h0.8
|
||||
c0.4,0,0.7,0.2,0.7,0.5c0,0.2-0.1,0.4-0.4,0.4v0c0.2,0,0.3,0.2,0.4,0.2c0.1,0.2,0,0.7,0,0.7h-0.4c0,0,0-0.4,0-0.5
|
||||
c0-0.1-0.1-0.3-0.2-0.3H114.4z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
BIN
dacite-1.1.0.tar.gz
Normal file
BIN
dacite-1.1.0.tar.gz
Normal file
Binary file not shown.
BIN
ethon-0.11.0.gem
BIN
ethon-0.11.0.gem
Binary file not shown.
BIN
ffi-1.9.25.gem
BIN
ffi-1.9.25.gem
Binary file not shown.
BIN
json-2.1.0.gem
BIN
json-2.1.0.gem
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
pcs-0.10.5.tar.gz
Normal file
BIN
pcs-0.10.5.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
BIN
pcs-web-ui-0.1.2.tar.gz
Normal file
BIN
pcs-web-ui-0.1.2.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
273
pcs.spec
273
pcs.spec
@ -1,40 +1,23 @@
|
||||
Name: pcs
|
||||
Version: 0.10.2
|
||||
Release: 5%{?dist}
|
||||
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
||||
# GPLv2: pcs
|
||||
# ASL 2.0: tornado
|
||||
# MIT: handlebars
|
||||
License: GPLv2 and ASL 2.0 and MIT
|
||||
URL: https://github.com/ClusterLabs/pcs
|
||||
Group: System Environment/Base
|
||||
Name: pcs
|
||||
Version: 0.10.5
|
||||
Release: 1
|
||||
License: GPLv2 and BSD-2-Clause and ASL 2.0 and MIT
|
||||
URL: https://github.com/ClusterLabs/pcs
|
||||
Summary: Pacemaker Configuration System
|
||||
#building only for architectures with pacemaker and corosync available
|
||||
ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %{arm}
|
||||
|
||||
%global version_or_commit %{version}
|
||||
# %%global version_or_commit f556c4adb538c8a95d763472d370f3f5d27eb38a
|
||||
%global pcs_source_name %{name}-%{version_or_commit}
|
||||
|
||||
# ui_commit can be determined by hash, tag or branch
|
||||
%global ui_commit 0.1.1
|
||||
%global ui_commit 0.1.2
|
||||
%global ui_src_name pcs-web-ui-%{ui_commit}
|
||||
|
||||
%global pcs_snmp_pkg_name pcs-snmp
|
||||
|
||||
%global pyagentx_version 0.4.pcs.2
|
||||
%global tornado_version 5.0.2
|
||||
%global version_rubygem_backports 3.11.4
|
||||
%global version_rubygem_ethon 0.11.0
|
||||
%global version_rubygem_ffi 1.9.25
|
||||
%global version_rubygem_json 2.1.0
|
||||
%global version_rubygem_mustermann 1.0.3
|
||||
%global version_rubygem_open4 1.3.4
|
||||
%global version_rubygem_rack 2.0.6
|
||||
%global version_rubygem_rack_protection 2.0.4
|
||||
%global version_rubygem_rack_test 1.0.0
|
||||
%global version_rubygem_sinatra 2.0.4
|
||||
%global version_rubygem_tilt 2.0.9
|
||||
%global pyagentx_version 0.4.pcs.2
|
||||
%global tornado_version 6.0.3
|
||||
%global dacite_version 1.1.0
|
||||
%global rubygem_tilt_version 2.0.9
|
||||
|
||||
# We do not use _libdir macro because upstream is not prepared for it.
|
||||
# Pcs does not include binaries and thus it should live in /usr/lib. Tornado
|
||||
@ -47,59 +30,27 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %{arm}
|
||||
%global pcsd_public_dir pcsd/public
|
||||
%global rubygem_cache_dir pcsd/vendor/cache
|
||||
%global rubygem_bundle_dir pcsd/vendor/bundle/ruby
|
||||
|
||||
# mangling shebang in /usr/lib/pcsd/vendor/bundle/ruby/gems/rack-2.0.5/test/cgi/test from /usr/bin/env ruby to #!/usr/bin/ruby
|
||||
#*** ERROR: ./usr/lib/pcsd/vendor/bundle/ruby/gems/rack-2.0.5/test/cgi/test.ru has shebang which doesn't start with '/' (../../bin/rackup)
|
||||
#mangling shebang in /usr/lib/pcsd/vendor/bundle/ruby/gems/rack-2.0.5/test/cgi/rackup_stub.rb from /usr/bin/env ruby to #!/usr/bin/ruby
|
||||
#*** WARNING: ./usr/lib/pcsd/vendor/bundle/ruby/gems/rack-2.0.5/test/cgi/sample_rackup.ru is executable but has empty or no shebang, removing executable bit
|
||||
#*** WARNING: ./usr/lib/pcsd/vendor/bundle/ruby/gems/rack-2.0.5/test/cgi/lighttpd.conf is executable but has empty or no shebang, removing executable bit
|
||||
#*** ERROR: ambiguous python shebang in /usr/lib/pcsd/vendor/bundle/ruby/gems/ffi-1.9.25/ext/ffi_c/libffi/generate-darwin-source-and-headers.py: #!/usr/bin/env python. Change it to python3 (or python2) explicitly.
|
||||
%undefine __brp_mangle_shebangs
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Python_bytecompilation
|
||||
# Enforce python3 because bytecompilation of tornado produced warnings:
|
||||
# DEPRECATION WARNING: python2 invoked with /usr/bin/python.
|
||||
# Use /usr/bin/python3 or /usr/bin/python2
|
||||
# /usr/bin/python will be removed or switched to Python 3 in the future.
|
||||
%global __python %{__python3}
|
||||
# This package depends on automagic byte compilation
|
||||
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
|
||||
%global _python_bytecompile_extra 1
|
||||
|
||||
|
||||
#part after last slash is recognized as filename in look-aside repository
|
||||
#desired name is achived by trick with hash anchor
|
||||
Source0: %{url}/archive/%{version_or_commit}/%{pcs_source_name}.tar.gz
|
||||
Source1: HAM-logo.png
|
||||
Source2: pcsd-bundle-config-2
|
||||
|
||||
Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}.tar.gz#/pyagentx-%{pyagentx_version}.tar.gz
|
||||
Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}.tar.gz#/tornado-%{tornado_version}.tar.gz
|
||||
|
||||
Source81: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
|
||||
Source82: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
|
||||
Source83: https://rubygems.org/downloads/ffi-%{version_rubygem_ffi}.gem
|
||||
Source84: https://rubygems.org/downloads/json-%{version_rubygem_json}.gem
|
||||
Source86: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem
|
||||
# We needed to re-upload open4 rubygem because of issues with sources in gating.
|
||||
# Unfortunately, there was no newer version available, therefore we had to
|
||||
# change its 'version' ourselves.
|
||||
Source87: https://rubygems.org/downloads/open4-%{version_rubygem_open4}.gem#/open4-%{version_rubygem_open4}-1.gem
|
||||
Source88: https://rubygems.org/downloads/rack-%{version_rubygem_rack}.gem
|
||||
Source89: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_protection}.gem
|
||||
Source90: https://rubygems.org/downloads/rack-test-%{version_rubygem_rack_test}.gem
|
||||
Source91: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem
|
||||
Source92: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem
|
||||
|
||||
Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
|
||||
Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz
|
||||
|
||||
# Patches from upstream.
|
||||
# They should come before downstream patches to avoid unnecessary conflicts.
|
||||
# Z-streams are exception here: they can come from upstream but should be
|
||||
# applied at the end to keep z-stream changes as straightforward as possible.
|
||||
#Patch1: bz1676957-01-fix-crashes-in-pcs-host-auth.patch
|
||||
#Patch2: bz1657166-01-Updating-a-bundle-is-a-bit-cumber.patch
|
||||
#Patch3: bz1725183-01-fix-and-options-for-non-root-users.patch
|
||||
#Patch4: bz1740218-01-set-authkey-length-to-256-bytes.patch
|
||||
|
||||
# Downstream patches do not come from upstream. They adapt pcs for specific
|
||||
# RHEL needs.
|
||||
#Patch101: do-not-support-cluster-setup-with-udp-u-transport.patch
|
||||
Source1: pcsd-bundle-config-1
|
||||
Source2: https://rubygems.org/downloads/tilt-%{rubygem_tilt_version}.gem
|
||||
Source3: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz
|
||||
Source4: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz
|
||||
Source5: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
|
||||
Source6: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
|
||||
Source7: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz
|
||||
|
||||
# git for patches
|
||||
BuildRequires: git
|
||||
@ -107,9 +58,9 @@ BuildRequires: git
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: execstack
|
||||
# python for pcs
|
||||
#BuildRequires: platform-python
|
||||
BuildRequires: python3 >= 3.6
|
||||
BuildRequires: python3-devel
|
||||
#BuildRequires: platform-python-setuptools
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pycurl
|
||||
# gcc for compiling custom rubygems
|
||||
BuildRequires: gcc
|
||||
@ -117,7 +68,16 @@ BuildRequires: gcc-c++
|
||||
# ruby and gems for pcsd
|
||||
BuildRequires: ruby >= 2.2.0
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: rubygem-backports
|
||||
BuildRequires: rubygem-ethon
|
||||
BuildRequires: rubygem-ffi
|
||||
BuildRequires: rubygem-io-console
|
||||
BuildRequires: rubygem-json
|
||||
BuildRequires: rubygem-open4
|
||||
BuildRequires: rubygem-rack
|
||||
BuildRequires: rubygem-rack-protection
|
||||
BuildRequires: rubygem-rack-test
|
||||
BuildRequires: rubygem-sinatra
|
||||
# ruby libraries for tests
|
||||
BuildRequires: rubygem-test-unit
|
||||
# for touching patch files (sanitization function)
|
||||
@ -128,37 +88,48 @@ BuildRequires: systemd
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: python3-pyOpenSSL
|
||||
BuildRequires: pacemaker-cli >= 2.0.0
|
||||
# BuildRequires: fence-agents-all
|
||||
BuildRequires: fence-virt
|
||||
BuildRequires: fence-agents-apc
|
||||
BuildRequires: fence-agents-scsi
|
||||
BuildRequires: fence-agents-ipmilan
|
||||
# fence-agents-ilo2 issue with dependencies
|
||||
# BuildRequires: fence-agents-ilo2
|
||||
BuildRequires: booth-site
|
||||
# pcsd fonts and font management tools for creating symlinks to fonts
|
||||
BuildRequires: fontconfig
|
||||
BuildRequires: liberation-sans-fonts
|
||||
BuildRequires: overpass-fonts
|
||||
# OpenEuler logo for creating symlink of favicon
|
||||
BuildRequires: openEuler-logos
|
||||
|
||||
# for building web ui
|
||||
BuildRequires: npm
|
||||
|
||||
# python and libraries for pcs, setuptools for pcs entrypoint
|
||||
#Requires: platform-python
|
||||
Requires: python3 >= 3.6
|
||||
Requires: python3-lxml
|
||||
#Requires: platform-python-setuptools
|
||||
Requires: python3-setuptools
|
||||
Requires: python3-clufter => 0.70.0
|
||||
Requires: python3-pycurl
|
||||
# ruby and gems for pcsd
|
||||
Requires: ruby >= 2.2.0
|
||||
Requires: rubygems
|
||||
Requires: rubygem-backports
|
||||
Requires: rubygem-ethon
|
||||
Requires: rubygem-ffi
|
||||
Requires: rubygem-json
|
||||
Requires: rubygem-open4
|
||||
Requires: rubygem-rack
|
||||
Requires: rubygem-rack-protection
|
||||
Requires: rubygem-rack-test
|
||||
Requires: rubygem-sinatra
|
||||
# ruby and gems for pcsd-ruby
|
||||
Requires: rubygem-daemons
|
||||
Requires: rubygem-eventmachine
|
||||
Requires: rubygem-thin
|
||||
# for killall
|
||||
Requires: psmisc
|
||||
# for working with certificates (validation etc.)
|
||||
Requires: openssl
|
||||
Requires: python3-pyOpenSSL
|
||||
# cluster stack and related packages
|
||||
Requires: pcmk-cluster-manager >= 2.0.0
|
||||
Suggests: pacemaker
|
||||
Requires: (corosync >= 2.99 if pacemaker)
|
||||
# pcs enables corosync encryption by default so we require libknet1-plugins-all
|
||||
@ -174,21 +145,10 @@ Requires: pam
|
||||
# pcsd fonts
|
||||
Requires: liberation-sans-fonts
|
||||
Requires: overpass-fonts
|
||||
# favicon openeuler logo
|
||||
Requires: openEuler-logos
|
||||
|
||||
Provides: bundled(tornado) = %{tornado_version}
|
||||
Provides: bundled(backports) = %{version_rubygem_backports}
|
||||
Provides: bundled(ethon) = %{version_rubygem_ethon}
|
||||
Provides: bundled(ffi) = %{version_rubygem_ffi}
|
||||
Provides: bundled(json) = %{version_rubygem_json}
|
||||
Provides: bundled(mustermann) = %{version_rubygem_mustermann}
|
||||
Provides: bundled(open4) = %{version_rubygem_open4}
|
||||
Provides: bundled(rack) = %{version_rubygem_rack}
|
||||
Provides: bundled(rack) = %{version_rubygem_rack_protection}
|
||||
Provides: bundled(rack) = %{version_rubygem_rack_test}
|
||||
Provides: bundled(sinatra) = %{version_rubygem_sinatra}
|
||||
Provides: bundled(tilt) = %{version_rubygem_tilt}
|
||||
Provides: bundled(dacite) = %{dacite_version}
|
||||
Provides: bundled(rubygem-tilt) = %{rubygem_tilt_version}
|
||||
|
||||
%description
|
||||
pcs is a corosync and pacemaker configuration tool. It permits users to
|
||||
@ -196,13 +156,8 @@ easily view, modify and create pacemaker based clusters.
|
||||
|
||||
# pcs-snmp package definition
|
||||
%package -n %{pcs_snmp_pkg_name}
|
||||
Group: System Environment/Base
|
||||
Summary: Pacemaker cluster SNMP agent
|
||||
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
||||
# GPLv2: pcs
|
||||
# BSD-2-Clause: pyagentx
|
||||
License: GPLv2 and BSD-2-Clause
|
||||
URL: https://github.com/ClusterLabs/pcs
|
||||
|
||||
# tar for unpacking pyagetx source tar ball
|
||||
BuildRequires: tar
|
||||
@ -254,59 +209,47 @@ update_times_patch(){
|
||||
update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}`
|
||||
}
|
||||
|
||||
#update_times_patch %{PATCH1}
|
||||
#update_times_patch %{PATCH2}
|
||||
#update_times_patch %{PATCH3}
|
||||
#update_times_patch %{PATCH4}
|
||||
#update_times_patch %{PATCH101}
|
||||
# update_times_patch %%{PATCH0}
|
||||
|
||||
cp -f %SOURCE1 pcsd/public/images
|
||||
# prepare dirs/files necessary for building web ui
|
||||
# inside SOURCE100 is only directory %%{ui_src_name}
|
||||
tar -xzf %SOURCE100 -C %{pcsd_public_dir}
|
||||
tar -xf %SOURCE101 -C %{pcsd_public_dir}/%{ui_src_name}
|
||||
# inside SOURCE6 is only directory %%{ui_src_name}
|
||||
tar -xzf %SOURCE6 -C %{pcsd_public_dir}
|
||||
tar -xf %SOURCE7 -C %{pcsd_public_dir}/%{ui_src_name}
|
||||
|
||||
# prepare dirs/files necessary for building all bundles
|
||||
# -----------------------------------------------------
|
||||
# 1) configuration for rubygems
|
||||
mkdir -p pcsd/.bundle
|
||||
cp -f %SOURCE2 pcsd/.bundle/config
|
||||
cp -f %SOURCE1 pcsd/.bundle/config
|
||||
|
||||
# 2) rubygems sources
|
||||
mkdir -p pcsd/vendor/cache
|
||||
cp -f %SOURCE81 pcsd/vendor/cache
|
||||
cp -f %SOURCE82 pcsd/vendor/cache
|
||||
cp -f %SOURCE83 pcsd/vendor/cache
|
||||
cp -f %SOURCE84 pcsd/vendor/cache
|
||||
cp -f %SOURCE86 pcsd/vendor/cache
|
||||
# For reason why we are renaming open4 rubygem, see comment of source
|
||||
# definition above.
|
||||
cp -f %SOURCE87 pcsd/vendor/cache/open4-%{version_rubygem_open4}.gem
|
||||
cp -f %SOURCE88 pcsd/vendor/cache
|
||||
cp -f %SOURCE89 pcsd/vendor/cache
|
||||
cp -f %SOURCE90 pcsd/vendor/cache
|
||||
cp -f %SOURCE91 pcsd/vendor/cache
|
||||
cp -f %SOURCE92 pcsd/vendor/cache
|
||||
|
||||
mkdir -p %{rubygem_cache_dir}
|
||||
cp -f %SOURCE2 %{rubygem_cache_dir}
|
||||
|
||||
# 3) dir for python bundles
|
||||
mkdir -p %{bundled_src_dir}
|
||||
|
||||
# 4) sources for pyagentx
|
||||
tar -xzf %SOURCE41 -C %{bundled_src_dir}
|
||||
tar -xzf %SOURCE3 -C %{bundled_src_dir}
|
||||
mv %{bundled_src_dir}/pyagentx-%{pyagentx_version} %{bundled_src_dir}/pyagentx
|
||||
update_times %SOURCE41 `find %{bundled_src_dir}/pyagentx -follow`
|
||||
update_times %SOURCE3 `find %{bundled_src_dir}/pyagentx -follow`
|
||||
cp %{bundled_src_dir}/pyagentx/LICENSE.txt pyagentx_LICENSE.txt
|
||||
cp %{bundled_src_dir}/pyagentx/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt
|
||||
cp %{bundled_src_dir}/pyagentx/README.md pyagentx_README.md
|
||||
|
||||
# 5) sources for tornado
|
||||
tar -xzf %SOURCE42 -C %{bundled_src_dir}
|
||||
tar -xzf %SOURCE4 -C %{bundled_src_dir}
|
||||
mv %{bundled_src_dir}/tornado-%{tornado_version} %{bundled_src_dir}/tornado
|
||||
update_times %SOURCE42 `find %{bundled_src_dir}/tornado -follow`
|
||||
update_times %SOURCE4 `find %{bundled_src_dir}/tornado -follow`
|
||||
cp %{bundled_src_dir}/tornado/LICENSE tornado_LICENSE
|
||||
cp %{bundled_src_dir}/tornado/README.rst tornado_README.rst
|
||||
|
||||
# 7) sources for python dacite
|
||||
tar -xzf %SOURCE5 -C %{bundled_src_dir}
|
||||
mv %{bundled_src_dir}/dacite-%{dacite_version} %{bundled_src_dir}/dacite
|
||||
cp %{bundled_src_dir}/dacite/LICENSE dacite_LICENSE
|
||||
cp %{bundled_src_dir}/dacite/README.md dacite_README.md
|
||||
|
||||
%build
|
||||
%define debug_package %{nil}
|
||||
|
||||
@ -317,32 +260,9 @@ pwd
|
||||
# build bundled rubygems (in main install it is disabled by BUILD_GEMS=false)
|
||||
mkdir -p %{rubygem_bundle_dir}
|
||||
gem install \
|
||||
--force --verbose --no-rdoc --no-ri -l --no-user-install \
|
||||
--force --verbose --no-document -l --no-user-install \
|
||||
-i %{rubygem_bundle_dir} \
|
||||
%{rubygem_cache_dir}/backports-%{version_rubygem_backports}.gem \
|
||||
%{rubygem_cache_dir}/ethon-%{version_rubygem_ethon}.gem \
|
||||
%{rubygem_cache_dir}/ffi-%{version_rubygem_ffi}.gem \
|
||||
%{rubygem_cache_dir}/json-%{version_rubygem_json}.gem \
|
||||
%{rubygem_cache_dir}/mustermann-%{version_rubygem_mustermann}.gem \
|
||||
%{rubygem_cache_dir}/open4-%{version_rubygem_open4}.gem \
|
||||
%{rubygem_cache_dir}/rack-%{version_rubygem_rack}.gem \
|
||||
%{rubygem_cache_dir}/rack-protection-%{version_rubygem_rack_protection}.gem \
|
||||
%{rubygem_cache_dir}/rack-test-%{version_rubygem_rack_test}.gem \
|
||||
%{rubygem_cache_dir}/sinatra-%{version_rubygem_sinatra}.gem \
|
||||
%{rubygem_cache_dir}/tilt-%{version_rubygem_tilt}.gem \
|
||||
-- '--with-ldflags="-Wl,-z,relro -Wl,-z,ibt -Wl,-z,now -Wl,--gc-sections"' \
|
||||
'--with-cflags="-O2 -ffunction-sections"'
|
||||
|
||||
# We can remove files required for gem compilation
|
||||
rm -rf %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/ext
|
||||
rm -rf %{rubygem_bundle_dir}/gems/json-%{version_rubygem_json}/ext
|
||||
|
||||
|
||||
# With this file there is "File is not stripped" problem during rpmdiff
|
||||
# See https://docs.engineering.redhat.com/display/HTD/rpmdiff-elf-stripping
|
||||
for fname in `find %{rubygem_bundle_dir}/extensions -type f -name "*.so"`; do
|
||||
strip ${fname}
|
||||
done
|
||||
%{rubygem_cache_dir}/tilt-%{rubygem_tilt_version}.gem \
|
||||
|
||||
# build web ui and put it to pcsd
|
||||
make -C %{pcsd_public_dir}/%{ui_src_name} build
|
||||
@ -360,6 +280,7 @@ make install \
|
||||
BASH_COMPLETION_DIR=%{_datadir}/bash-completion/completions \
|
||||
BUNDLE_PYAGENTX_SRC_DIR=`readlink -f %{bundled_src_dir}/pyagentx` \
|
||||
BUNDLE_TORNADO_SRC_DIR=`readlink -f %{bundled_src_dir}/tornado` \
|
||||
BUNDLE_DACITE_SRC_DIR=`readlink -f %{bundled_src_dir}/dacite` \
|
||||
BUILD_GEMS=false \
|
||||
SYSTEMCTL_OVERRIDE=true \
|
||||
hdrdir="%{_includedir}" \
|
||||
@ -372,9 +293,6 @@ for fname in `find ${RPM_BUILD_ROOT}%{pcs_libdir}/pcs/bundled/packages/tornado/
|
||||
strip ${fname}
|
||||
done
|
||||
|
||||
# symlink favicon into pcsd directories
|
||||
ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{pcs_libdir}/%{pcsd_public_dir}/images/favicon.png
|
||||
|
||||
#after the ruby gem compilation we do not need ruby gems in the cache
|
||||
rm -r -v $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_cache_dir}
|
||||
|
||||
@ -394,14 +312,11 @@ run_all_tests(){
|
||||
|
||||
# disabled tests:
|
||||
#
|
||||
# pcs_test.tier0.lib.commands.test_resource_agent.DescribeAgentUtf8.test_describe
|
||||
# For an unknown reason this test is failing in mock environment and
|
||||
# passing outside the mock environment.
|
||||
# TODO: Investigate the issue
|
||||
|
||||
BUNDLED_LIB_LOCATION=$RPM_BUILD_ROOT%{pcs_libdir}/pcs/bundled/packages \
|
||||
%{__python3} pcs_test/suite.py -v --vanilla --all-but \
|
||||
pcs_test.tier0.lib.commands.test_resource_agent.DescribeAgentUtf8.test_describe \
|
||||
%{__python3} pcs_test/suite.py -v --vanilla \
|
||||
--all-but \
|
||||
pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_get_not_locked \
|
||||
pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_post_not_locked \
|
||||
|
||||
test_result_python=$?
|
||||
|
||||
@ -428,23 +343,33 @@ remove_all_tests() {
|
||||
rm -r -v ${pcsd_dir}/public/js/dev
|
||||
}
|
||||
|
||||
#run_all_tests
|
||||
#remove_all_tests
|
||||
run_all_tests
|
||||
remove_all_tests
|
||||
|
||||
%posttrans
|
||||
# Make sure the new version of the daemon is runnning.
|
||||
# Also, make sure to start pcsd-ruby if it hasn't been started or even
|
||||
# installed before. This is done by restarting pcsd.service.
|
||||
%{_bindir}/systemctl daemon-reload
|
||||
%{_bindir}/systemctl try-restart pcsd.service
|
||||
|
||||
%post
|
||||
%systemd_post pcsd.service
|
||||
%systemd_post pcsd-ruby.service
|
||||
|
||||
%post -n %{pcs_snmp_pkg_name}
|
||||
%systemd_post pcs_snmp_agent.service
|
||||
|
||||
%preun
|
||||
%systemd_preun pcsd.service
|
||||
%systemd_preun pcsd-ruby.service
|
||||
|
||||
%preun -n %{pcs_snmp_pkg_name}
|
||||
%systemd_preun pcs_snmp_agent.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart pcsd.service
|
||||
%systemd_postun_with_restart pcsd-ruby.service
|
||||
|
||||
%postun -n %{pcs_snmp_pkg_name}
|
||||
%systemd_postun_with_restart pcs_snmp_agent.service
|
||||
@ -453,7 +378,9 @@ remove_all_tests() {
|
||||
%doc CHANGELOG.md
|
||||
%doc README.md
|
||||
%doc tornado_README.rst
|
||||
%doc dacite_README.md
|
||||
%license tornado_LICENSE
|
||||
%license dacite_LICENSE
|
||||
%license COPYING
|
||||
%{python3_sitelib}/pcs
|
||||
%{python3_sitelib}/pcs-%{version}-py3.*.egg-info
|
||||
@ -463,7 +390,9 @@ remove_all_tests() {
|
||||
%{pcs_libdir}/pcsd/*
|
||||
%{pcs_libdir}/pcsd/.bundle/config
|
||||
%{pcs_libdir}/pcs/bundled/packages/tornado*
|
||||
%{pcs_libdir}/pcs/bundled/packages/dacite*
|
||||
%{_unitdir}/pcsd.service
|
||||
%{_unitdir}/pcsd-ruby.service
|
||||
%{_datadir}/bash-completion/completions/pcs
|
||||
%{_sharedstatedir}/pcsd
|
||||
%{_sysconfdir}/pam.d/pcsd
|
||||
@ -480,13 +409,14 @@ remove_all_tests() {
|
||||
%{_mandir}/man8/pcs.*
|
||||
%{_mandir}/man8/pcsd.*
|
||||
%exclude %{pcs_libdir}/pcsd/*.debian
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.service
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.conf
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.8
|
||||
%exclude %{pcs_libdir}/pcsd/public/js/dev/*
|
||||
%exclude %{pcs_libdir}/pcsd/Gemfile
|
||||
%exclude %{pcs_libdir}/pcsd/Gemfile.lock
|
||||
%exclude %{pcs_libdir}/pcsd/Makefile
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.conf
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.service
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd-ruby.service
|
||||
%exclude %{pcs_libdir}/pcsd/pcsd.8
|
||||
%exclude %{pcs_libdir}/pcsd/public/js/dev/*
|
||||
%exclude %{python3_sitelib}/pcs/bash_completion
|
||||
%exclude %{python3_sitelib}/pcs/pcs.8
|
||||
%exclude %{python3_sitelib}/pcs/pcs
|
||||
@ -505,6 +435,9 @@ remove_all_tests() {
|
||||
%license pyagentx_LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Fri Oct 30 2020 jiangxinyu <jiangxinyu@kylinos.cn> - 0.10.5-1
|
||||
- Upgrade the pcs package version to 0.10.5-1
|
||||
|
||||
* Sun Apr 26 2020 wangmian<wangmian@kylinos.cn> - 0.10.2-5
|
||||
- Change pcs ui
|
||||
|
||||
|
||||
5
pcs.yaml
Normal file
5
pcs.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
---
|
||||
version_control: github
|
||||
src_repo: ClusterLabs/pcs
|
||||
tag_prefix: ^v
|
||||
separator: "."
|
||||
BIN
rack-2.0.6.gem
BIN
rack-2.0.6.gem
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
tornado-6.0.3.tar.gz
Normal file
BIN
tornado-6.0.3.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user