- updated to 4.0.2

[packages/dlm.git] / dlm.spec

diff --git a/dlm.spec b/dlm.spec
index 10df3bd9dda95b02a32ad9bc9dc61ef3f64bdb9c..cb73222d4b47938f17589377b090c03b20c14397 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,28 +1,27 @@
+#
 # 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
-Version:       3.99.5
-Release:       3
+Version:       4.0.2
+Release:       1
 License:       LGPL v2.1+, GPL v2
 Group:         Libraries
-Source0:       http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
-# Source0-md5: cad4999d0c42000bf5898af34f587728
+Source0:       https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{version}.tar.bz2
+# Source0-md5: 87703eae3fb4a3312c10cc1b58f064b8
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
-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
+Source4:       dlm.conf
 URL:           http://sources.redhat.com/cluster/dlm/
-BuildRequires: corosync-devel
-%{?with_dlm_stonith:BuildRequires:     corosync-devel}
+BuildRequires: corosync-devel >= 2.0
+%{?with_dlm_stonith:BuildRequires:     libxml2-devel >= 2.0}
+%{?with_dlm_stonith:BuildRequires:     pacemaker-devel >= 1.1}
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: systemd-devel
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts
 Requires:      systemd-units >= 38
@@ -68,12 +67,6 @@ Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %{__make} \
@@ -99,6 +92,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 \
@@ -125,6 +119,7 @@ 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
@@ -150,11 +145,16 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README.license
-%attr(755,root,root) %{_sbindir}/*
+%{?with_dlm_stonith:%attr(755,root,root) %{_sbindir}/dlm_controld}
+%attr(755,root,root) %{_sbindir}/dlm_stonith
+%attr(755,root,root) %{_sbindir}/dlm_tool
+%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}
-%{_mandir}/man8/*.8*
+%{_mandir}/man8/dlm_controld.8*
+%{_mandir}/man8/dlm_tool.8*
 %{_mandir}/man5/dlm.conf.5*
 %{systemdunitdir}/%{name}.service
 %{systemdtmpfilesdir}/%{name}.conf
@@ -162,12 +162,12 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libdlm.so.3
 %attr(755,root,root) %{_libdir}/libdlm.so.3.*
-%ghost %{_libdir}/libdlm_lt.so.3
+%attr(755,root,root) %ghost %{_libdir}/libdlm.so.3
 %attr(755,root,root) %{_libdir}/libdlm_lt.so.3.*
-%ghost %{_libdir}/libdlmcontrol.so.3
+%attr(755,root,root) %ghost %{_libdir}/libdlm_lt.so.3
 %attr(755,root,root) %{_libdir}/libdlmcontrol.so.3.*
+%attr(755,root,root) %ghost %{_libdir}/libdlmcontrol.so.3
 
 %files devel
 %defattr(644,root,root,755)
@@ -180,4 +180,3 @@ fi
 %{_mandir}/man3/libdlm.3*
 %{_pkgconfigdir}/libdlm.pc
 %{_pkgconfigdir}/libdlm_lt.pc
-