Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at 2012-07-30 21:50:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/device-mapper (Old) and /work/SRC/openSUSE:Factory/.device-mapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "device-mapper", Maintainer is "DMZhang@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/device-mapper/device-mapper.changes 2011-10-21 16:28:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.device-mapper.new/device-mapper.changes 2012-07-30 21:50:03.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 26 17:15:54 UTC 2012 - fcrozat@suse.com + +- Add blkid-builtin.patch: use built-in blkid from udev + +------------------------------------------------------------------- lvm2.changes: same change New: ---- blkid-builtin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.Aex0AZ/_old 2012-07-30 21:50:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Aex0AZ/_new 2012-07-30 21:50:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package device-mapper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,17 @@ # - Name: device-mapper -License: GPL-2.0+ ; LGPL-2.1+ -Group: System/Base # bug437293 %ifarch ppc64 Obsoletes: device-mapper-64bit %endif # Version: 1.02.63 -Release: 3 +Release: 0 Summary: Device Mapper Tools +License: GPL-2.0+ ; LGPL-2.1+ +Group: System/Base Source: LVM2.2.02.84.tgz Source1: boot.device-mapper Source2: mkinitrd-devmapper-setup.sh @@ -43,8 +42,10 @@ Patch67: udev-rules_update.diff #Patch68: device-mapper-pkgconfig.patch Patch70: sleep-try-open-count.diff +Patch71: blkid-builtin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libselinux-devel libudev-devel +BuildRequires: libselinux-devel +BuildRequires: libudev-devel PreReq: %insserv_prereq %fillup_prereq %description @@ -52,7 +53,6 @@ mapper. %package devel -License: GPL-2.0+ ; LGPL-2.1+ Summary: Development package for the device mapper Group: System/Base Requires: %name = %version @@ -72,6 +72,7 @@ #%patch68 -p0 %patch70 -p1 #%patch80 -p0 +%patch71 -p1 %build CFLAGS="$RPM_OPT_FLAGS" \ ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.Aex0AZ/_old 2012-07-30 21:50:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Aex0AZ/_new 2012-07-30 21:50:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lvm2-clvm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,22 @@ Url: http://sources.redhat.com/cluster/clvm/ Name: lvm2-clvm -BuildRequires: device-mapper-devel libcorosync-devel libdlm-devel libopenais-devel readline-devel +BuildRequires: device-mapper-devel +BuildRequires: libcorosync-devel +BuildRequires: libdlm-devel +BuildRequires: libopenais-devel BuildRequires: libselinux-devel -License: GPL-2.0+ ; LGPL-2.1+ -Group: System/Base +BuildRequires: readline-devel Version: 2.02.84 -Release: 3 -Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais +Release: 0 +Requires: device-mapper >= 1.02.25 +Requires: lvm2 = %{version} +Requires: openais Provides: clvm PreReq: %fillup_prereq %insserv_prereq Summary: Clustered LVM2 +License: GPL-2.0+ ; LGPL-2.1+ +Group: System/Base Source: LVM2.%{version}.tgz Source1: lvm.conf Source2: boot.lvm ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.Aex0AZ/_old 2012-07-30 21:50:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Aex0AZ/_new 2012-07-30 21:50:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lvm2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,9 @@ Url: http://sources.redhat.com/cluster/clvm/ Name: lvm2 +BuildRequires: libselinux-devel +BuildRequires: libudev-devel BuildRequires: readline-devel -BuildRequires: libselinux-devel libudev-devel -License: GPL-2.0+ ; LGPL-2.1+ -Group: System/Base Requires: device-mapper >= 1.02.25 Provides: lvm PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd @@ -30,8 +29,10 @@ PreReq: sysvinit(boot.device-mapper) %endif Version: 2.02.84 -Release: 3 +Release: 0 Summary: LVM2 Tools +License: GPL-2.0+ ; LGPL-2.1+ +Group: System/Base Source: LVM2.%{version}.tgz Source1: lvm.conf Source2: boot.lvm @@ -62,8 +63,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not a real replacement but we drop evms -Provides: evms = 2.5.5 evms-gui = 2.5.5 evms-devel = 2.5.5 evms-ha = 2.5.5 -Obsoletes: evms <= 2.5.5 evms-gui <= 2.5.5 evms-devel <= 2.5.5 evms-ha <= 2.5.5 +Provides: evms = 2.5.5 +Provides: evms-devel = 2.5.5 +Provides: evms-gui = 2.5.5 +Provides: evms-ha = 2.5.5 +Obsoletes: evms <= 2.5.5 +Obsoletes: evms-devel <= 2.5.5 +Obsoletes: evms-gui <= 2.5.5 +Obsoletes: evms-ha <= 2.5.5 %description Programs and man pages for configuring and using the LVM2 Logical ++++++ blkid-builtin.patch ++++++

From a2e5d2cb9c53cff13e48efa7ba2791d9deb36314 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha <prajnoha@redhat.com> Date: Thu, 16 Feb 2012 14:39:02 +0000 Subject: [PATCH] Switch to using built-in blkid in 13-dm-disk.rules.

Available in udev since version 176. --- WHATS_NEW_DM | 1 + udev/13-dm-disk.rules | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) Index: LVM2.2.02.84/udev/13-dm-disk.rules =================================================================== --- LVM2.2.02.84.orig/udev/13-dm-disk.rules +++ LVM2.2.02.84/udev/13-dm-disk.rules @@ -20,7 +20,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id ENV{DM_SUSPENDED}=="1", GOTO="dm_end" ENV{DM_TARGET_TYPES}=="|*error*", GOTO="dm_end" -IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode" +IMPORT{builtin}="blkid" ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS+="link_priority=-100" OPTIONS+="watch" ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org