-#
-# Conditional build:
-%bcond_without dlm_stonith # build without fencing helper
-#
Summary: General-purpose distributed lock manager
Summary(pl.UTF-8): Zarządca rozproszonych blokad ogólnego przeznaczenia
Name: dlm
-%define _snap 4283123f0b13eafc46d825050c5142cf44be79c3
-Version: 4.0.3
+Version: 4.0.9
Release: 1
License: LGPL v2.1+, GPL v2
Group: Libraries
-Source0: https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{_snap}.tar.bz2
-# Source0-md5: 575174a0d7b0e1a6e45ec88f447c48cc
+Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
+# Source0-md5: b05551993126679926a432ea5bdf9689
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
-Source4: dlm.conf
-Patch0: %{name}-systemd-configfs.patch
-Patch1: old_udev_dir.patch
-URL: http://sources.redhat.com/cluster/dlm/
+Source4: %{name}.conf
+Patch0: old_udev_dir.patch
+URL: http://www.sourceware.org/cluster/dlm/
BuildRequires: corosync-devel >= 2.0
-%{?with_dlm_stonith:BuildRequires: libxml2-devel >= 2.0}
-%{?with_dlm_stonith:BuildRequires: pacemaker-devel >= 1.1}
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: pacemaker-devel >= 1.1
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.644
BuildRequires: systemd-devel
%package libs
Summary: DLM libraries
Summary(pl.UTF-8): Biblioteki DLM
-Group: Development/Libraries
+Group: Libraries
Obsoletes: cluster-dlm-libs
%description libs
Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
%prep
-%setup -q -n %{name}-%{_snap}
-
+%setup -q
%patch0 -p1
-%patch1 -p1
+
+%if "%{cc_version}" < "8"
+%{__sed} -i -e 's/-fstack-clash-protection//' {dlm_controld,dlm_tool,fence,libdlm}/Makefile
+%endif
%build
%{__make} \
HDRDIR=%{_includedir} \
CC="%{__cc} %{rpmcflags} %{rpmcppflags} %{rpmldflags}"
-%if %{with dlm_stonith}
-%{__make} -C fence \
- PREFIX=%{_prefix} \
- LIBNUM=%{_lib} \
- BINDIR=%{_sbindir} \
- LIBDIR=%{_libdir} \
- MANDIR=%{_mandir} \
- HDRDIR=%{_includedir} \
- CC="%{__cc} %{rpmcflags} %{rpmcppflags} %{rpmldflags}"
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}} \
MANDIR=%{_mandir} \
HDRDIR=%{_includedir}
-%if %{with dlm_stonith}
-%{__make} -C fence install \
- DESTDIR=$RPM_BUILD_ROOT \
- PREFIX=%{_prefix} \
- LIBNUM=%{_lib} \
- BINDIR=%{_sbindir} \
- LIBDIR=%{_libdir} \
- MANDIR=%{_mandir} \
- HDRDIR=%{_includedir}
-%endif
-
-install init/%{name}.service $RPM_BUILD_ROOT%{systemdunitdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+cp -p init/%{name}.service $RPM_BUILD_ROOT%{systemdunitdir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
-%systemd_post %{name}.service
-
-%preun
/sbin/chkconfig --add %{name}
%service %{name} restart
-%systemd_preun %{name}.service
+%systemd_post %{name}.service
-%postun
+%preun
if [ "$1" = "0" ]; then
%service -q %{name} stop
/sbin/chkconfig --del %{name}
fi
+%systemd_preun %{name}.service
+
+%postun
%systemd_reload
%post libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
%doc README.license
-%{?with_dlm_stonith:%attr(755,root,root) %{_sbindir}/dlm_controld}
+%attr(755,root,root) %{_sbindir}/dlm_controld
%attr(755,root,root) %{_sbindir}/dlm_stonith
%attr(755,root,root) %{_sbindir}/dlm_tool
%dir %{_sysconfdir}/%{name}
%attr(755,root,root) %{_libdir}/libdlmcontrol.so
%{_includedir}/libdlm.h
%{_includedir}/libdlmcontrol.h
-%{_mandir}/man3/dlm_*.3*
-%{_mandir}/man3/libdlm.3*
%{_pkgconfigdir}/libdlm.pc
%{_pkgconfigdir}/libdlm_lt.pc
+%{_pkgconfigdir}/libdlmcontrol.pc
+%{_mandir}/man3/dlm_*.3*
+%{_mandir}/man3/libdlm.3*