Hello community,
here is the log from the commit of package device-mapper for openSUSE:Factory
checked in at Mon Mar 14 09:51:00 CET 2011.
--------
--- device-mapper/lvm2-clvm.changes 2010-10-31 19:17:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/device-mapper/lvm2-clvm.changes
2011-02-22 08:40:49.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 22 07:32:46 UTC 2011 - x...@novell.com
+
+- Re-enable clvmd build
+ - Cleanup unused patches
+ - Build against corosync instead of openais
+
+-------------------------------------------------------------------
--- device-mapper/lvm2.changes 2011-02-15 10:00:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/device-mapper/lvm2.changes 2011-03-10
12:08:40.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 10 11:07:22 UTC 2011 - co...@novell.com
+
+- prereq sysvinit(boot.device-mapper) to fix build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bug-486952_clvmd-check-returncode-of-dlmrelease.diff
call_cpg_leave_before_shutdown.diff
clvmd-openais-use-dlm.diff
enable-clvmd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ device-mapper.spec ++++++
--- /var/tmp/diff_new_pack.PNnqX4/_old 2011-03-14 09:49:45.000000000 +0100
+++ /var/tmp/diff_new_pack.PNnqX4/_new 2011-03-14 09:49:45.000000000 +0100
@@ -27,7 +27,7 @@
%endif
#
Version: 1.02.63
-Release: 1
+Release: 2
Summary: Device Mapper Tools
Source: LVM2.2.02.84.tgz
Source1: boot.device-mapper
++++++ lvm2-clvm.spec ++++++
--- /var/tmp/diff_new_pack.PNnqX4/_old 2011-03-14 09:49:45.000000000 +0100
+++ /var/tmp/diff_new_pack.PNnqX4/_new 2011-03-14 09:49:45.000000000 +0100
@@ -24,7 +24,7 @@
License: GPLv2+ ; LGPLv2.1+
Group: System/Base
Version: 2.02.84
-Release: 1
+Release: 2
Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais
Provides: clvm
PreReq: %fillup_prereq %insserv_prereq
@@ -45,15 +45,11 @@
Patch4: sys_mount_instead_linux_fs.diff
Patch6: man_page_sectors.diff
Patch11: cmdline_large_minor.diff
-Patch12: enable-clvmd.patch
Patch13: pipe_buff-definition.diff
Patch14: lvm-pv-create-link.diff
-#Patch15: dmeventd-link-libcmd.diff
-Patch16: clvmd-openais-use-dlm.diff
-Patch17: bug-486952_clvmd-check-returncode-of-dlmrelease.diff
Patch19: dont_ignore_tmp_device_file.diff
Patch20: support-drbd-filter.diff
-Patch21: call_cpg_leave_before_shutdown.diff
+Patch22: handle_extended_devt.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -69,15 +65,11 @@
%patch4
%patch6
%patch11
-%patch12
%patch13
-%patch14 -p1
-#%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+#%patch14 -p1
%patch19 -p1
%patch20 -p1
-%patch21 -p1
+%patch22 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \
@@ -88,11 +80,11 @@
--enable-selinux \
--enable-cmdlib \
--libdir=/%_lib --with-usrlibdir=%_libdir --enable-dmeventd
--enable-cmdlib \
- --with-clvmd=openais --datarootdir=/usr/share
+ --with-clvmd=corosync --datarootdir=/usr/share
make
%install
-pushd daemons
+pushd daemons/clvmd
make install DESTDIR=$RPM_BUILD_ROOT
popd
pushd man
@@ -100,22 +92,13 @@
popd
install -D -m 755 $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd
rm $RPM_BUILD_ROOT/sbin/clvmd
-rm $RPM_BUILD_ROOT/sbin/dmeventd
-rm $RPM_BUILD_ROOT/usr/include/libdevmapper-event.h
-rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2mirror.*
-rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2snapshot.*
-rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event.*
-rm $RPM_BUILD_ROOT/%_libdir/libdevmapper-event-lvm2.so
-rm $RPM_BUILD_ROOT/%_libdir/libdevmapper-event.so
-rm $RPM_BUILD_ROOT/%{_lib}/device-mapper/libdevmapper-event-lvm2mirror.so
-rm $RPM_BUILD_ROOT/%{_lib}/device-mapper/libdevmapper-event-lvm2snapshot.so
-rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2.so.*
rm -rf $RPM_BUILD_ROOT/%{_mandir}/man5
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/lv*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/pv*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vg*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dmsetup*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/fsadm*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dmeventd*
install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd
%clean
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.PNnqX4/_old 2011-03-14 09:49:45.000000000 +0100
+++ /var/tmp/diff_new_pack.PNnqX4/_new 2011-03-14 09:49:45.000000000 +0100
@@ -26,9 +26,12 @@
Requires: device-mapper >= 1.02.25
Provides: lvm
PreReq: %fillup_prereq %insserv_prereq
+%if %suse_version > 1130
+PreReq: sysvinit(boot.device-mapper)
+%endif
AutoReqProv: on
Version: 2.02.84
-Release: 1
+Release: 2
Summary: LVM2 Tools
Source: LVM2.%{version}.tgz
Source1: lvm.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
