- updated to 4.0.6 release

- removed obsolete systemd-configfs patch

diff --git a/dlm-systemd-configfs.patch b/dlm-systemd-configfs.patch
deleted file mode 100644 (file)
index ac94eb0..0000000
--- a/dlm-systemd-configfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -dur dlm-4.0.2.orig/init/dlm.service dlm-4.0.2/init/dlm.service
---- dlm-4.0.2.orig/init/dlm.service    2013-07-31 17:50:26.000000000 +0200
-+++ dlm-4.0.2/init/dlm.service 2014-01-06 12:07:28.823033320 +0100
-@@ -1,5 +1,6 @@
- [Unit]
- Description=dlm control daemon
-+Requires=sys-kernel-config.mount
- After=syslog.target network.target corosync.service sys-kernel-config.mount
- 
- [Service]

diff --git a/dlm.spec b/dlm.spec
index a906b76e4d58fdcf2073674d3b8c00e81e95f551..11cf9cf640f852d85e1d815f3f38b99d7ae8e3a3 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -2,22 +2,20 @@
 # Conditional build:
 %bcond_without dlm_stonith     # build without fencing helper
 
-%define     _snap   4283123f0b13eafc46d825050c5142cf44be79c3
 Summary:       General-purpose distributed lock manager
 Summary(pl.UTF-8):     Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:          dlm
-Version:       4.0.3
-Release:       3
+Version:       4.0.6
+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://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{version}.tar.xz
+# Source0-md5: 809ae130c5a29a7344078da8015754d3
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.conf
-Patch0:                %{name}-systemd-configfs.patch
-Patch1:                old_udev_dir.patch
+Patch0:                old_udev_dir.patch
 URL:           http://sources.redhat.com/cluster/dlm/
 BuildRequires: corosync-devel >= 2.0
 %{?with_dlm_stonith:BuildRequires:     libxml2-devel >= 2.0}
@@ -25,6 +23,8 @@ BuildRequires:        corosync-devel >= 2.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.644
 BuildRequires: systemd-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts
 Requires:      systemd-units >= 208-8
@@ -69,10 +69,8 @@ Header files and development documentation for DLM.
 Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 
 %prep
-%setup -q -n %{name}-%{_snap}
-
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} \