redadmin/pcs
1
0
Fork 0
forked from rpms/pcs
Code Pull Requests Activity

Fedora 27 related fixes

Browse Source
This commit is contained in:
Ondrej Mular 2017-09-14 15:17:50 +02:00
parent 8cadf8c813
commit 3e00919e92
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -43,3 +43,4 @@
/sinatra-1.4.8.gem
/tilt-2.0.6.gem
/pcs-0.9.159.tar.gz
/rack-protection-1.5.3.gem

17
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs
Version: 0.9.159
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
URL: https://github.com/ClusterLabs/pcs
Group: System Environment/Base
@ -17,9 +17,9 @@ Source13: https://rubygems.org/downloads/rpam-ruby19-1.2.1.gem
Source14: https://rubygems.org/downloads/sinatra-1.4.8.gem
Source15: https://rubygems.org/downloads/sinatra-contrib-1.4.7.gem
Source16: https://rubygems.org/downloads/tilt-2.0.6.gem
Source17: https://rubygems.org/downloads/rack-protection-1.5.3.gem
Patch0: fedfix.patch
Patch1: fix-setuptools.patch
# git for patches
BuildRequires: git
@ -45,7 +45,6 @@ BuildRequires: rubygem-io-console
BuildRequires: rubygem-json
BuildRequires: rubygem-multi_json
BuildRequires: rubygem-open4
BuildRequires: rubygem-rack-protection
BuildRequires: rubygem-rack-test
# ruby libraries for tests
BuildRequires: rubygem-test-unit
@ -80,7 +79,6 @@ Requires: rubygem-ffi
Requires: rubygem-json
Requires: rubygem-multi_json
Requires: rubygem-open4
Requires: rubygem-rack-protection
Requires: rubygem-rack-test
# pcsd fonts
Requires: liberation-sans-fonts
@ -108,6 +106,8 @@ Provides: bundled(rubygem-rpam-ruby19) = 1.2.1
Provides: bundled(rubygem-sinatra) = 1.4.8
Provides: bundled(rubygem-sinatra-contrib) = 1.4.7
Provides: bundled(rubygem-tilt) = 2.0.6
# fedora provides version 2.0.0 which is not compatible with pcsd currently
Provides: bundled(rubygem-rack-protection) = 1.5.3
%description
pcs is a corosync and pacemaker configuration tool. It permits users to
@ -133,8 +133,6 @@ UpdateTimestamps() {
%patch0 -p1
UpdateTimestamps -p1 %{PATCH0}
%patch1 -p1
UpdateTimestamps -p1 %{PATCH1}
mkdir -p pcsd/.bundle
cp -f %SOURCE1 pcsd/.bundle/config
@ -146,9 +144,11 @@ cp -f %SOURCE13 pcsd/vendor/cache
cp -f %SOURCE14 pcsd/vendor/cache
cp -f %SOURCE15 pcsd/vendor/cache
cp -f %SOURCE16 pcsd/vendor/cache
cp -f %SOURCE17 pcsd/vendor/cache
#ruby gems copied
%build
%define debug_package %{nil}
%install
rm -rf $RPM_BUILD_ROOT
@ -286,6 +286,11 @@ end
%exclude %{python3_sitelib}/pcs/pcs
%changelog
* Thu Sep 14 2017 Ondrej Mular <omular@redhat.com> - 0.9.159-4
- Bundle rubygem-rack-protection which is being updated to 2.0.0 in Fedora.
- Removed setuptools patch.
- Disabled debuginfo subpackage.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.159-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

1
sources
View File

@ -6,3 +6,4 @@ SHA512 (rpam-ruby19-1.2.1.gem) = b403964295e96a6247289518ff46e59bbae6c78bcfb647e
SHA512 (sinatra-1.4.8.gem) = e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
SHA512 (sinatra-contrib-1.4.7.gem) = dbb4deaed6844a70352e4fbe0f7b71d000acd525a3f6a20c2dc66d3ddc87b93a3b9c33ac315a0a5f4e30b82631c14196fefc9b6fe29c0aee29ea6db4d000361c
SHA512 (tilt-2.0.6.gem) = 173245f5edd8cf2d31edccd36d375530448e58da1fd744bdf471818ee9b306317f52ecfb9aa8c39ec7746ea3900e600ebfc5f96dfa66724d3e8a4386bd9da260
SHA512 (rack-protection-1.5.3.gem) = 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a