[lvm2] Merge f13 spec file.

[Alasdair Kergon]

commit 8c0d53dadcc2ecc6f2a002ac57fe820a03b6ce51
Author: Alasdair G Kergon <agk at redhat.com>
Date:   Mon Aug 2 20:23:04 2010 +0100

    Merge f13 spec file.

 lvm2-2_02_73-fix-exported-syms.patch |   10 ++++++++++
 lvm2.spec                            |   13 +++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/lvm2-2_02_73-fix-exported-syms.patch b/lvm2-2_02_73-fix-exported-syms.patch
index 496cd7e..9b852f1 100644
--- a/lvm2-2_02_73-fix-exported-syms.patch
+++ b/lvm2-2_02_73-fix-exported-syms.patch
@@ -126,3 +126,13 @@ diff -ru LVM2.2.02.72/configure.in LVM2/configure.in
  Version 2.02.72 - 28th July 2010  [CVE-2010-2526]
  =================================================
    Change clvmd to communicate with lvm2 via a socket in /var/run/lvm.
+--- LVM2.2.02.72/make.tmpl.in	2 Aug 2010 12:57:04 -0000	1.109
++++ LVM2/make.tmpl.in	2 Aug 2010 19:02:35 -0000
+@@ -73,6 +73,7 @@
+ DEFAULT_BACKUP_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_BACKUP_SUBDIR@
+ DEFAULT_CACHE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_CACHE_SUBDIR@
+ DEFAULT_LOCK_DIR = @DEFAULT_LOCK_DIR@
++DEFAULT_RUN_DIR = @DEFAULT_RUN_DIR@
+ 
+ # Setup vpath search paths for some suffixes
+ vpath %.c $(srcdir)
diff --git a/lvm2.spec b/lvm2.spec
index 53b810f..3b178b5 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,6 +1,12 @@
 %define device_mapper_version 1.02.53
 %define enable_cluster 1
 
+%if %{fedora} < 14
+%define udev_version 153-1
+%else
+%define udev_version 158-1
+%endif
+
 %if %{enable_cluster}
 %define corosync_version 1.2.0-1
 %define openais_version 1.1.1-1
@@ -16,7 +22,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.72
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -324,7 +330,7 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Requires: device-mapper-libs = %{device_mapper_version}-%{release}
-Requires: udev >= 158-1
+Requires: udev >= %{udev_version}
 Requires: libudev
 Requires: util-linux-ng >= 2.15
 # We need dracut to install required udev rules if udev_sync
@@ -439,6 +445,9 @@ the device-mapper event library.
 
 
 %changelog
+* Mon Aug 2 2010 Alasdair Kergon <agk at redhat.com> - 2.02.72-4
+- Merge f13, f14 and rawhide spec files.
+
 * Sat Jul 31 2010 Alasdair Kergon <agk at redhat.com> - 2.02.72-3
 - Address lvm2-cluster security flaw CVE-2010-2526.
     https://bugzilla.redhat.com/CVE-2010-2526