From 6f458716a359b06d9cfea40bdb7f3e6497e49507 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 20 Nov 2025 13:02:19 +0800 Subject: [PATCH] cleanup spec --- ...t-report-success-incorrect-parameter.patch | 16 +---- fence-virt.spec | 63 +++++-------------- 2 files changed, 18 insertions(+), 61 deletions(-) diff --git a/bz1668357-fence_virt-dont-report-success-incorrect-parameter.patch b/bz1668357-fence_virt-dont-report-success-incorrect-parameter.patch index 6c541f9..10b2799 100644 --- a/bz1668357-fence_virt-dont-report-success-incorrect-parameter.patch +++ b/bz1668357-fence_virt-dont-report-success-incorrect-parameter.patch @@ -4,23 +4,9 @@ Date: Fri, 9 Nov 2018 13:10:29 +0100 Subject: [PATCH] fence_virt: dont report success for incorrect parameters --- - client/main.c | 2 +- client/options.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) + 1 file changed, 1 insertion(+) -diff --git a/client/main.c b/client/main.c -index 8e94093..a3135e3 100644 ---- a/client/main.c -+++ b/client/main.c -@@ -112,7 +112,7 @@ main(int argc, char **argv) - args.mode = MODE_VSOCK; - - if (args.flags & F_ERR) { -- if (args.op != FENCE_VALIDATEALL) -+ if (args.op != FENCE_VALIDATEALL) - args_usage(argv[0], my_options, (argc == 1)); - exit(1); - } diff --git a/client/options.c b/client/options.c index a3f321b..4b5ed56 100644 --- a/client/options.c diff --git a/fence-virt.spec b/fence-virt.spec index b0f8945..758a611 100644 --- a/fence-virt.spec +++ b/fence-virt.spec @@ -1,13 +1,13 @@ Name: fence-virt Version: 0.4.0 -Release: 14 +Release: 15 Summary: A pluggable fencing framework for virtual machines Group: System Environment/Base -License: GPLv2+ +License: GPL-2.0-or-later ExclusiveArch: x86_64 aarch64 riscv64 loongarch64 ppc64le -URL: http://fence-virt.sourceforge.net +URL: https://fence-virt.sourceforge.net Source0: https://github.com/ClusterLabs/fence-virt/archive/v%{version}.tar.gz Patch0: bz1624110-1-harden-fPIE.patch Patch1: bz1624110-2-fence_virt-fix-coredump.patch @@ -24,9 +24,7 @@ BuildRequires: flex bison libuuid-devel BuildRequires: gcc-c++ make BuildRequires: systemd-units -Requires(post): systemd-sysv systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?systemd_requires} Conflicts: fence-agents < 3.0.5-2 @@ -99,35 +97,26 @@ are located on corosync cluster nodes. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -F1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autosetup -p1 %build ./autogen.sh +export CFLAGS="%build_cflags %build_ldflags" +export CXXFLAGS="%build_cxxflags %build_ldflags" %{configure} --disable-libvirt-qmf-plugin --enable-cpg-plugin -make %{?_smp_mflags} +%make_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install # Systemd unit file mkdir -p %{buildroot}/%{_unitdir}/ install -m 0644 fence_virtd.service %{buildroot}/%{_unitdir}/ -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) -%doc COPYING TODO README +%license COPYING +%doc TODO README %{_sbindir}/fence_virt %{_sbindir}/fence_xvm %{_mandir}/man8/fence_virt.* @@ -136,28 +125,13 @@ rm -rf %{buildroot} %post ccs_update_schema > /dev/null 2>&1 ||: -# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post fence_virtd.service %preun -# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable fence_virtd.service &> /dev/null || : - /bin/systemctl stop fence_virtd.service &> /dev/null || : -fi +%systemd_preun fence_virtd.service %postun -# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd -/bin/systemctl daemon-reload &> /dev/null || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart fence_virtd.service &> /dev/null || : -fi - +%systemd_postun_with_restart fence_virtd.service %triggerun -- fence_virtd < 0.3.0-1 # https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Packages_migrating_to_a_systemd_unit_file_from_a_SysV_initscript @@ -168,7 +142,6 @@ fi %files -n fence-virtd -%defattr(-,root,root,-) %{_sbindir}/fence_virtd %{_unitdir}/fence_virtd.service %config(noreplace) %{_sysconfdir}/fence_virt.conf @@ -177,26 +150,24 @@ fi %{_mandir}/man8/fence_virtd.* %files -n fence-virtd-multicast -%defattr(-,root,root,-) %{_libdir}/%{name}/multicast.so %files -n fence-virtd-serial -%defattr(-,root,root,-) %{_libdir}/%{name}/serial.so %files -n fence-virtd-tcp -%defattr(-,root,root,-) %{_libdir}/%{name}/tcp.so %files -n fence-virtd-libvirt -%defattr(-,root,root,-) %{_libdir}/%{name}/libvirt.so %files -n fence-virtd-cpg -%defattr(-,root,root,-) %{_libdir}/%{name}/cpg.so %changelog +* Thu Nov 20 2025 Funda Wang - 0.4.0-15 +- cleanup spec + * Thu Mar 7 2024 Ren Zhijie - 0.4.0-14 - Add support for ppc64le -- Gitee