Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2013-01-30 11:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes 2012-06-26 16:06:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2013-01-30 11:16:59.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Jan 28 14:48:07 UTC 2013 - [email protected] + +- small cleanup of spec file + +------------------------------------------------------------------- +Mon Jan 28 06:42:32 UTC 2013 - [email protected] + +- fix the build issue on openSuSE 12.3 Milestone 1 (bnc#798263) + add bnc798263-fix-opensuse123-compile-error.patch + +------------------------------------------------------------------- +Fri Aug 24 02:51:55 UTC 2012 - [email protected] + +- dlm_controld: fix plock dev_write no op (bnc#777137) + add bnc777137-fix-plock-dev_write-no-op.patch + +------------------------------------------------------------------- New: ---- bnc777137-fix-plock-dev_write-no-op.patch bnc798263-fix-opensuse123-compile-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.E5sAz6/_old 2013-01-30 11:17:00.000000000 +0100 +++ /var/tmp/diff_new_pack.E5sAz6/_new 2013-01-30 11:17:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdlm # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -30,7 +30,7 @@ Name: libdlm Summary: Application interface to the kernel's distributed lock manager -License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA Version: 3.00.01 Release: 0 @@ -38,6 +38,8 @@ Source: libdlm.tar.bz2 Patch0: libdlm-pacemaker.patch Patch1: libdlm-gcc47.patch +Patch2: bnc777137-fix-plock-dev_write-no-op.patch +Patch3: bnc798263-fix-opensuse123-compile-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pacemaker BuildRequires: glib2-devel @@ -52,44 +54,9 @@ Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. - - -Authors: --------- - A. J. Lewis <[email protected]> - Abhijith Das <[email protected]> - Adam Manthei <[email protected]> - Alasdair G. Kergon <[email protected]> - Andrew Price <[email protected]> - Benjamin Marzinski <[email protected]> - Bob Peterson <[email protected]> - Chris Feist <[email protected]> - Christine Caulfield <[email protected]> - Daniel Phillips <[email protected]> - David Teigland <[email protected]> - Fabio M. Di Nitto <[email protected]> - James Parsons <[email protected]> - Joel Becker <[email protected]> - Jonathan Brassow <[email protected]> - Ken Preslan <[email protected]> - Lon Hohberger <[email protected]> - Marc - A. Dahlhaus <[email protected]> - Marek Grac <[email protected]> - Mark Hlawatschek <[email protected]> - Michael Conrad Tadpol Tilstra <[email protected]> - Patrick Caulfield <[email protected]> - Robert Peterson <[email protected]> - Ross Vandegrift <[email protected]> - Ryan McCabe <[email protected]> - Ryan O'Hara <[email protected]> - Stanko Kupcevic <[email protected]> - Steven Whitehouse <[email protected]> - Wendy Cheng <[email protected]> - jparsons <[email protected]> - %package -n libdlm3 Summary: Application interface to the kernel's distributed lock manager -License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA Obsoletes: libdlm2 Conflicts: libdlm2 @@ -98,39 +65,6 @@ Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. -Authors: --------- - A. J. Lewis <[email protected]> - Abhijith Das <[email protected]> - Adam Manthei <[email protected]> - Alasdair G. Kergon <[email protected]> - Andrew Price <[email protected]> - Benjamin Marzinski <[email protected]> - Bob Peterson <[email protected]> - Chris Feist <[email protected]> - Christine Caulfield <[email protected]> - Daniel Phillips <[email protected]> - David Teigland <[email protected]> - Fabio M. Di Nitto <[email protected]> - James Parsons <[email protected]> - Joel Becker <[email protected]> - Jonathan Brassow <[email protected]> - Ken Preslan <[email protected]> - Lon Hohberger <[email protected]> - Marc - A. Dahlhaus <[email protected]> - Marek Grac <[email protected]> - Mark Hlawatschek <[email protected]> - Michael Conrad Tadpol Tilstra <[email protected]> - Patrick Caulfield <[email protected]> - Robert Peterson <[email protected]> - Ross Vandegrift <[email protected]> - Ryan McCabe <[email protected]> - Ryan O'Hara <[email protected]> - Stanko Kupcevic <[email protected]> - Steven Whitehouse <[email protected]> - Wendy Cheng <[email protected]> - jparsons <[email protected]> - %package devel Summary: Application interface to the kernel's distributed lock manager License: LGPL-2.1+ @@ -141,46 +75,13 @@ Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. - - -Authors: --------- - A. J. Lewis <[email protected]> - Abhijith Das <[email protected]> - Adam Manthei <[email protected]> - Alasdair G. Kergon <[email protected]> - Andrew Price <[email protected]> - Benjamin Marzinski <[email protected]> - Bob Peterson <[email protected]> - Chris Feist <[email protected]> - Christine Caulfield <[email protected]> - Daniel Phillips <[email protected]> - David Teigland <[email protected]> - Fabio M. Di Nitto <[email protected]> - James Parsons <[email protected]> - Joel Becker <[email protected]> - Jonathan Brassow <[email protected]> - Ken Preslan <[email protected]> - Lon Hohberger <[email protected]> - Marc - A. Dahlhaus <[email protected]> - Marek Grac <[email protected]> - Mark Hlawatschek <[email protected]> - Michael Conrad Tadpol Tilstra <[email protected]> - Patrick Caulfield <[email protected]> - Robert Peterson <[email protected]> - Ross Vandegrift <[email protected]> - Ryan McCabe <[email protected]> - Ryan O'Hara <[email protected]> - Stanko Kupcevic <[email protected]> - Steven Whitehouse <[email protected]> - Wendy Cheng <[email protected]> - jparsons <[email protected]> - %prep ########################################################### %setup -n libdlm %patch0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 ########################################################### %build ++++++ bnc777137-fix-plock-dev_write-no-op.patch ++++++ Index: libdlm/group/dlm_controld/plock.c =================================================================== --- libdlm.orig/group/dlm_controld/plock.c +++ libdlm/group/dlm_controld/plock.c @@ -1641,8 +1641,10 @@ void process_plocks(int ci) return; fail: - info.rv = rv; - rv = write(plock_device_fd, &info, sizeof(info)); + if (!(info.flags & DLM_PLOCK_FL_CLOSE)) { + info.rv = rv; + rv = write(plock_device_fd, &info, sizeof(info)); + } } void process_saved_plocks(struct lockspace *ls) ++++++ bnc798263-fix-opensuse123-compile-error.patch ++++++ Index: libdlm/configure.ac =================================================================== --- libdlm.orig/configure.ac +++ libdlm/configure.ac @@ -115,10 +115,10 @@ if test "x${enable_pacemaker}" = xno && AC_MSG_ERROR([At least one dlm_controld build method (cman or pacemaker) has to be selected]) fi -AC_ARG_WITH([kernel], - [ --with-kernel=path path to kernel source. ], - [ KERNEL_DIR="$withval" ], - [ KERNEL_DIR="$DEFAULT_KERNEL_DIR" ]) +#AC_ARG_WITH([kernel], +# [ --with-kernel=path path to kernel source. ], +# [ KERNEL_DIR="$withval" ], +# [ KERNEL_DIR="$DEFAULT_KERNEL_DIR" ]) KERNEL_CPPFLAGS="-I$KERNEL_DIR/include" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
