- rel 9

- ude_get_dev_path is deprecated and has been removed in udev 183

Changed files:
    lvm2.spec -> 1.201
    udev-deprecated.patch -> 1.1

diff --git a/lvm2.spec b/lvm2.spec
index e0633f67775cea6f35ceb8fa556fe04ecfd072c2..83a7a996d7ca14cada636c234a8b813df443bb45 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -43,7 +43,7 @@ Summary:      The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 Version:       2.02.95
-Release:       8
+Release:       9
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -56,6 +56,7 @@ Patch3:               %{name}-clvmd_init.patch
 Patch4:                dl-dlsym.patch
 Patch5:                pldize_lvm2_monitor.patch
 Patch6:                %{name}-wrapper.patch
+Patch7:                udev-deprecated.patch
 URL:           http://sources.redhat.com/lvm2/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -247,6 +248,7 @@ potrzeby initrd.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.

diff --git a/udev-deprecated.patch b/udev-deprecated.patch
new file mode 100644 (file)
index 0000000..f2a26bf
--- /dev/null
+++ b/udev-deprecated.patch
@@ -0,0 +1,29 @@
+--- LVM2.2.02.95/lib/misc/lvm-wrappers.c~      2011-04-22 14:00:00.000000000 +0200
++++ LVM2.2.02.95/lib/misc/lvm-wrappers.c       2012-06-02 17:13:13.996363539 +0200
+@@ -72,7 +72,7 @@
+               return NULL;
+       }
+ 
+-      return udev_get_dev_path(_udev);
++      return "/dev";
+ }
+ 
+ struct udev* udev_get_library_context(void)
+--- LVM2.2.02.95/tools/dmsetup.c~      2012-06-02 17:11:33.999700397 +0200
++++ LVM2.2.02.95/tools/dmsetup.c       2012-06-02 17:18:14.323019614 +0200
+@@ -1047,12 +1047,11 @@
+                         " defined by --udevcookie option.",
+                         _udev_cookie);
+ 
+-      if (!(udev = udev_new()) ||
+-          !(udev_dev_dir = udev_get_dev_path(udev)) ||
+-          !*udev_dev_dir) {
+-              log_error("Could not get udev dev path.");
++      if (!(udev = udev_new())) {
++              log_error("Could not get udev.");
+               return 0;
+       }
++      udev_dev_dir = "/dev";
+       udev_dev_dir_len = strlen(udev_dev_dir);
+ 
+       /*