Compare commits

..

No commits in common. "c8" and "imports/c9-beta/dlm-4.1.1-1.el9" have entirely different histories.

3 changed files with 40 additions and 33 deletions

View File

@ -1 +1 @@
821112426f474123d090c570153d67468c4e0c11 SOURCES/dlm-4.1.0.tar.gz a8fef90c11d7da2a9420eb19aab221952686881c SOURCES/dlm-4.1.1.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dlm-4.1.0.tar.gz SOURCES/dlm-4.1.1.tar.gz

View File

@ -1,17 +1,18 @@
Name: dlm Name: dlm
Version: 4.1.0 Version: 4.1.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ License: GPLv2 and GPLv2+ and LGPLv2+
# For a breakdown of the licensing, see README.license # For a breakdown of the licensing, see README.license
Group: System Environment/Kernel
Summary: dlm control daemon and tool Summary: dlm control daemon and tool
URL: https://pagure.io/dlm URL: https://pagure.io/dlm
BuildRequires: gcc
BuildRequires: glibc-kernheaders BuildRequires: glibc-kernheaders
BuildRequires: corosynclib-devel >= 1.99.9 BuildRequires: corosynclib-devel >= 3.1.0
BuildRequires: pacemaker-libs-devel >= 1.1.7 BuildRequires: pacemaker-libs-devel >= 1.1.7
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: make
Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
# Patch0: 0001-foo.patch # Patch0: 0001-foo.patch
@ -21,7 +22,7 @@ ExclusiveArch: i686 x86_64
%endif %endif
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Requires: corosync >= 1.99.9 Requires: corosync >= 3.1.0
%{?fedora:Requires: kernel-modules-extra} %{?fedora:Requires: kernel-modules-extra}
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
@ -38,8 +39,8 @@ The kernel dlm requires a user daemon to control membership.
%build %build
# upstream does not require configure # upstream does not require configure
# upstream does not support _smp_mflags # upstream does not support _smp_mflags
CFLAGS+=$RPM_OPT_FLAGS make CFLAGS=$RPM_OPT_FLAGS make
CFLAGS+=$RPM_OPT_FLAGS make -C fence CFLAGS=$RPM_OPT_FLAGS make -C fence
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -59,7 +60,6 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
%systemd_postun_with_restart dlm.service %systemd_postun_with_restart dlm.service
%files %files
%defattr(-,root,root,-)
%doc README.license %doc README.license
%{_unitdir}/dlm.service %{_unitdir}/dlm.service
%{_sbindir}/dlm_controld %{_sbindir}/dlm_controld
@ -72,25 +72,20 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
%package lib %package lib
Summary: Library for %{name} Summary: Library for %{name}
Group: System Environment/Libraries
Conflicts: clusterlib Conflicts: clusterlib
%description lib %description lib
The %{name}-lib package contains the libraries needed to use the dlm The %{name}-lib package contains the libraries needed to use the dlm
from userland applications. from userland applications.
%post lib -p /sbin/ldconfig %ldconfig_scriptlets lib
%postun lib -p /sbin/ldconfig
%files lib %files lib
%defattr(-,root,root,-) /usr/lib/udev/rules.d/*-dlm.rules
%{_prefix}/lib/udev/rules.d/*-dlm.rules
%{_libdir}/libdlm*.so.* %{_libdir}/libdlm*.so.*
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Conflicts: clusterlib-devel Conflicts: clusterlib-devel
@ -99,35 +94,47 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%files devel %files devel
%defattr(-,root,root,-)
%{_libdir}/libdlm*.so %{_libdir}/libdlm*.so
%{_includedir}/libdlm*.h %{_includedir}/libdlm*.h
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Wed Jan 13 2021 David Teigland <teigland@redhat.com> - 4.1.0-1 * Mon Nov 15 2021 David Teigland <teigland@redhat.com> - 4.1.1-1
- update to 4.1.0 - new upstream version
* Wed Jan 06 2021 David Teigland <teigland@redhat.com> - 4.0.9-4 * Wed Aug 25 2021 David Teigland <teigland@redhat.com> - 4.0.9-7
- dlm_controld: use new quorum api to detect missed failures - fix pacemaker header
* Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-6
- kick gating system - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-2 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-5
- try to kick gating system - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jun 11 2019 David Teigland <teigland@redhat.com> - 4.0.9-1 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-4
- update to 4.0.9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 23 2019 David Teigland <teigland@redhat.com> - 4.0.6-10 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-3
- dlm_controld: ignore unwanted uevent strings - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Oct 02 2018 David Teigland <teigland@redhat.com> - 4.0.6-9 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-2
- update makefile gcc flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Aug 09 2018 David Teigland <teigland@redhat.com> - 4.0.6-8 * Wed Jul 31 2019 David Teigland <teigland@redhat.com> - 4.0.9-1
- Work around glibc regression for major/minor header - New upstream realease
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Mar 24 2018 Richard W.M. Jones <rjones@redhat.com> - 4.0.6-8
- Fixes for glibc 2.27, required for riscv64.
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-7 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild