dlm_stonith BR fixed

[packages/dlm.git] / dlm.spec

diff --git a/dlm.spec b/dlm.spec
index a8971317d54dc0c7626b19f9aaa6bfb828591681..6d14e335cc93bc0abd17f3af74fd1fdbc21fd6eb 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -5,7 +5,7 @@ Summary:        General-purpose distributed lock manager
 Summary(pl.UTF-8):     Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:          dlm
 Version:       3.99.5
-Release:       3
+Release:       4
 License:       LGPL v2.1+, GPL v2
 Group:         Libraries
 Source0:       http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
@@ -13,13 +13,17 @@ Source0:    http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
+Source4:       dlm.conf
 Patch0:                %{name}-link_order.patch
 Patch1:                %{name}-after_configfs.patch
 Patch2:                %{name}_stonith-build.patch
 Patch3:                %{name}-mem_init.patch
+Patch4:                %{name}-signals.patch
+Patch5:                0003-dlm_controld-remove-fence_all-from-cli.patch
+Patch6:                dlm_stonith_reboot.patch
 URL:           http://sources.redhat.com/cluster/dlm/
 BuildRequires: corosync-devel
-%{?with_dlm_stonith:BuildRequires:     corosync-devel}
+%{?with_dlm_stonith:BuildRequires:     pacemaker-devel >= 1.1}
 BuildRequires: rpmbuild(macros) >= 1.644
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts
@@ -70,6 +74,9 @@ Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__make} \
@@ -95,6 +102,7 @@ Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}} \
+               $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
                $RPM_BUILD_ROOT{/var/run/dlm,%{systemdtmpfilesdir}}
 
 %{__make} install \
@@ -115,12 +123,16 @@ install -d $RPM_BUILD_ROOT{%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}} \
        LIBDIR=%{_libdir} \
        MANDIR=%{_mandir} \
        HDRDIR=%{_includedir}
+
+ln -s dlm_stonith $RPM_BUILD_ROOT%{_sbindir}/dlm_stonith_reboot
+ln -s dlm_stonith $RPM_BUILD_ROOT%{_sbindir}/dlm_stonith_off
 %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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,6 +159,8 @@ fi
 %defattr(644,root,root,755)
 %doc README.license
 %attr(755,root,root) %{_sbindir}/*
+%dir %{_sysconfdir}/%{name}
+%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 /lib/udev/rules.d/51-dlm.rules
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/%{name}