diff --git a/pcs.spec b/pcs.spec index a004dd4..8daffa8 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.11.7 -Release: 12 +Release: 13 License: GPL-2.0-only AND Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause OR Ruby) AND (BSD-2-Clause OR GPL-2.0-or-later) URL: https://github.com/ClusterLabs/pcs Group: System Environment/Base @@ -50,8 +50,6 @@ Patch9: increase-a-timeout-in-a-test.patch # ui patches: >200 # Patch201: bzNUMBER-01-name.patch -# git for patches -BuildRequires: git-core BuildRequires: make # printf from coreutils is used in makefile, head is used in spec BuildRequires: coreutils @@ -187,6 +185,9 @@ Provides: bundled(pyagentx) = %{pyagentx_version} SNMP agent that provides information about pacemaker cluster to the master agent (snmpd) %prep +%if "%{_vendor}" != "openEuler" +sed -i 's/openEuler/%{_vendor}/g' %{PATCH3} +%endif # -- following is inspired by python-simplejon.el5 -- # Update timestamps on the files touched by a patch, to avoid non-equal @@ -231,12 +232,12 @@ update_times_patch(){ # * http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # * https://rpm-software-management.github.io/rpm/manual/autosetup.html # patch web-ui sources -%autosetup -D -T -b 3 -a 4 -S git -n %{ui_src_name} -N +%autosetup -D -T -b 3 -a 4 -n %{ui_src_name} -N %autopatch -p1 -m 201 # update_times_patch %%{PATCH201} # patch pcs sources -%autosetup -S git -n %{pcs_source_name} -N +%autosetup -n %{pcs_source_name} -N %autopatch -p1 -m 0 # update_times_patch %%{PATCH0} update_times_patch %{PATCH0} @@ -406,6 +407,9 @@ run_all_tests %license pyagentx_LICENSE.txt %changelog +* Mon May 13 2024 zouzhimin - 0.11.7-13 +- fix: Support for other distributions and delete -S git from %autosetup + * Sat May 11 2024 bixiaoyan - 0.11.7-12 - export rule constraints in a non-deprecated way