Compare commits

..

No commits in common. "9261a103fad609d941ce76d57f558ed8f74559ad" and "c5d158df786a77a103a43ee4de2e6fa8369d1345" have entirely different histories.

4 changed files with 12 additions and 46 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,6 @@
# Conditionals # Conditionals
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>" # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
# to disable or enable specific features # to disable or enable specific features
%bcond_without userflags
%bcond_with runautogen %bcond_with runautogen
%bcond_without systemd %bcond_without systemd
@ -10,9 +9,9 @@
Name: corosync-qdevice Name: corosync-qdevice
Summary: The Corosync Cluster Engine Qdevice Summary: The Corosync Cluster Engine Qdevice
Version: 3.0.3 Version: 3.0.0
Release: 1 Release: 2%{?gitver}%{?dist}
License: BSD-3-Clause License: BSD
URL: https://github.com/corosync/corosync-qdevice URL: https://github.com/corosync/corosync-qdevice
Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
@ -41,7 +40,6 @@ BuildRequires: nss-devel
%if %{with runautogen} %if %{with runautogen}
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
%endif %endif
BuildRequires: make
%prep %prep
%setup -q -n %{name}-%{version}%{?gittarver} %setup -q -n %{name}-%{version}%{?gittarver}
@ -52,9 +50,6 @@ BuildRequires: make
%endif %endif
%{configure} \ %{configure} \
%if %{with userflags}
--enable-user-flags \
%endif
%if %{with systemd} %if %{with systemd}
--enable-systemd \ --enable-systemd \
%endif %endif
@ -64,20 +59,20 @@ BuildRequires: make
--with-systemddir=%{_unitdir} \ --with-systemddir=%{_unitdir} \
--docdir=%{_docdir} --docdir=%{_docdir}
%make_build make %{_smp_mflags}
%install %install
%make_install make install DESTDIR=%{buildroot}
## tree fixup ## tree fixup
# drop docs and html docs for now # drop docs and html docs for now
rm -rf %{buildroot}%{_docdir}/* rm -rf %{buildroot}%{_docdir}/*
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
# /etc/sysconfig/corosync-qdevice # /etc/sysconfig/corosync-qdevice
install -p -m 644 init/corosync-qdevice.sysconfig.example \ install -m 644 init/corosync-qdevice.sysconfig.example \
%{buildroot}%{_sysconfdir}/sysconfig/corosync-qdevice %{buildroot}%{_sysconfdir}/sysconfig/corosync-qdevice
# /etc/sysconfig/corosync-qnetd # /etc/sysconfig/corosync-qnetd
install -p -m 644 init/corosync-qnetd.sysconfig.example \ install -m 644 init/corosync-qnetd.sysconfig.example \
%{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
%if %{with systemd} %if %{with systemd}
@ -117,7 +112,6 @@ fi
%endif %endif
%files %files
%license LICENSE
%dir %{_sysconfdir}/corosync/qdevice %dir %{_sysconfdir}/corosync/qdevice
%dir %config(noreplace) %{_sysconfdir}/corosync/qdevice/net %dir %config(noreplace) %{_sysconfdir}/corosync/qdevice/net
%dir %{_localstatedir}/run/corosync-qdevice %dir %{_localstatedir}/run/corosync-qdevice
@ -134,18 +128,6 @@ fi
%{_mandir}/man8/corosync-qdevice-net-certutil.8* %{_mandir}/man8/corosync-qdevice-net-certutil.8*
%{_mandir}/man8/corosync-qdevice.8* %{_mandir}/man8/corosync-qdevice.8*
%package -n corosync-qdevice-devel
Summary: The Corosync Cluster Engine Qdevice Network Development Kit
Requires: pkgconfig
%description -n corosync-qdevice-devel
This package contains files used to develop using
The Corosync Cluster Engine Qdevice
%files -n corosync-qdevice-devel
%license LICENSE
%{_datadir}/pkgconfig/corosync-qdevice.pc
%package -n corosync-qnetd %package -n corosync-qnetd
Summary: The Corosync Cluster Engine Qdevice Network Daemon Summary: The Corosync Cluster Engine Qdevice Network Daemon
Requires: nss-tools Requires: nss-tools
@ -190,7 +172,6 @@ fi
%endif %endif
%files -n corosync-qnetd %files -n corosync-qnetd
%license LICENSE
%dir %config(noreplace) %attr(770, coroqnetd, coroqnetd) %{_sysconfdir}/corosync/qnetd %dir %config(noreplace) %attr(770, coroqnetd, coroqnetd) %{_sysconfdir}/corosync/qnetd
%dir %attr(770, coroqnetd, coroqnetd) %{_localstatedir}/run/corosync-qnetd %dir %attr(770, coroqnetd, coroqnetd) %{_localstatedir}/run/corosync-qnetd
%{_bindir}/corosync-qnetd %{_bindir}/corosync-qnetd
@ -207,17 +188,7 @@ fi
%{_mandir}/man8/corosync-qnetd.8* %{_mandir}/man8/corosync-qnetd.8*
%changelog %changelog
* Tue Feb 27 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 3.0.3-1
- Upgrade version to 3.0.3
* Tue Sep 13 2022 liqiuyu <liqiuyu@kylinos.cn> - 3.0.1-2
- Remove corosync-qdevice.service
* Mon Mar 28 2022 zouzhimin <zouzhimin@kylinos.cn> - 3.0.1-1
- Upgrade the corosync-qdevice package version to 3.0.1-1
* Fri Oct 30 2020 jiangxinyu <jiangxinyu@kylinos.cn> - 3.0.0-10
- Upgrade the corosync-qdevice package version to 3.0.0-10
* Thu Apr 16 2020 houjian<jian.hou@kylinos.cn> - 3.0.0-2 * Thu Apr 16 2020 houjian<jian.hou@kylinos.cn> - 3.0.0-2
- Init corosync-qdevice project - Init corosync-qdevice project

View File

@ -1,5 +0,0 @@
---
version_control: github
src_repo: corosync/corosync-qdevice
tag_prefix: ^v
separator: "."