From 29b5208192c155a4d11c6aadc59856bff1c2aa5f0daa872d1627a8f9e7d95b0b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 17 Nov 2008 16:22:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=27 --- dmeventd-link-libcmd.diff | 26 ++++++++++++++++++++++++++ lvm2.changes | 5 +++++ lvm2.spec | 17 +++++++++++------ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 dmeventd-link-libcmd.diff diff --git a/dmeventd-link-libcmd.diff b/dmeventd-link-libcmd.diff new file mode 100644 index 0000000..a3d7ce7 --- /dev/null +++ b/dmeventd-link-libcmd.diff @@ -0,0 +1,26 @@ +Index: LVM2.2.02.39/dmeventd/mirror/Makefile.in +=================================================================== +--- LVM2.2.02.39.orig/dmeventd/mirror/Makefile.in 2008-11-12 01:55:20.000000000 +0800 ++++ LVM2.2.02.39/dmeventd/mirror/Makefile.in 2008-11-12 02:11:41.000000000 +0800 +@@ -17,7 +17,7 @@ + VPATH = @srcdir@ + + INCLUDES += -I${top_srcdir}/tools +-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB) ++CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@ + + SOURCES = dmeventd_mirror.c + +Index: LVM2.2.02.39/dmeventd/snapshot/Makefile.in +=================================================================== +--- LVM2.2.02.39.orig/dmeventd/snapshot/Makefile.in 2008-11-12 01:55:20.000000000 +0800 ++++ LVM2.2.02.39/dmeventd/snapshot/Makefile.in 2008-11-12 02:11:57.000000000 +0800 +@@ -17,7 +17,7 @@ + VPATH = @srcdir@ + + INCLUDES += -I${top_srcdir}/tools +-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB) ++CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@ + + SOURCES = dmeventd_snapshot.c + diff --git a/lvm2.changes b/lvm2.changes index bcff423..305a4ae 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 12 02:22:56 CST 2008 - xwhu@suse.de + +- bnc#443677. dmeventd DSOs are linked against liblvm2cmd + ------------------------------------------------------------------- Thu Oct 9 11:54:47 CEST 2008 - xwhu@suse.de diff --git a/lvm2.spec b/lvm2.spec index 7b56b76..7fe51fc 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -28,7 +28,7 @@ Obsoletes: lvm PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.02.39 -Release: 7 +Release: 8 Summary: LVM2 Tools Source: LVM2.%{version}.tar.bz2 Source1: lvm.conf @@ -49,6 +49,7 @@ 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 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 @@ -84,6 +85,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %patch12 %patch13 %patch14 -p1 +%patch15 -p1 %build CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \ @@ -92,6 +94,7 @@ LDFLAGS="-L /usr/%_lib/openais" \ --mandir=%{_mandir} \ --includedir=/usr/include \ --enable-selinux \ + --enable-cmdlib \ --libdir=/%_lib --enable-dmeventd --enable-cmdlib \ --with-clvmd=openais make @@ -254,6 +257,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vgsplit.8.gz %changelog +* Wed Nov 12 2008 xwhu@suse.de +- bnc#443677. dmeventd DSOs are linked against liblvm2cmd * Thu Oct 09 2008 xwhu@suse.de - bnc#432782. Remove vol_id in 64-lvm2.rules. * Mon Sep 29 2008 ro@suse.de @@ -293,13 +298,13 @@ rm -rf $RPM_BUILD_ROOT - enabled SELinux support [Fate#303662] * Fri Aug 22 2008 xwhu@suse.de - Remove the -p option for fillup_and_insserv -* Wed Aug 13 2008 xwhu@suse.de +* Tue Aug 12 2008 xwhu@suse.de - Add Should-Stop to boot.lvm -* Fri Aug 01 2008 xwhu@suse.de +* Thu Jul 31 2008 xwhu@suse.de - repack LVM2.2.02.38.tar.bz2 into bz2 format * Wed Jul 23 2008 hare@suse.de - Include mkinitrd scriptlets. -* Fri Jun 27 2008 xwhu@suse.de +* Thu Jun 26 2008 xwhu@suse.de - update to 2.02.38 Fix tracking of validity of PVs with no mdas in lvmcache. Fix return values for reporting commands when run with no PVs, LVs, or VGs. @@ -335,7 +340,7 @@ rm -rf $RPM_BUILD_ROOT - Split clvmd into a separate package (bnc#384708) * Wed Apr 23 2008 xwhu@suse.de - Change async lock primitives to sync -* Wed Apr 23 2008 xwhu@suse.de +* Tue Apr 22 2008 xwhu@suse.de - Fix build aginst beta definition of PIPE_BUF is missing * Tue Apr 22 2008 xwhu@suse.de @@ -734,7 +739,7 @@ rm -rf $RPM_BUILD_ROOT - accept additional devices (IDE->64, iseries/vd->8, #39114) * Thu Apr 01 2004 fehr@suse.de - update to new version 2.00.09 (fixes #34657 and #36877) -* Tue Mar 02 2004 ro@suse.de +* Mon Mar 01 2004 ro@suse.de - boot.lvm: root-fs is mounted-rw by boot.rootfsck * Thu Feb 26 2004 fehr@suse.de - skip cdroms and device with zero size on probing