rpms/dmraid/devel libversion-display.patch, NONE, 1.1 dmraid.spec, 1.117, 1.118

[Heinz Mauelshagen]

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14759

Modified Files:
	dmraid.spec 
Added Files:
	libversion-display.patch 
Log Message:
Return full internal library name on calls to libdmraid_version()

libversion-display.patch:
 lib_context.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE libversion-display.patch ---
diff --git a/lib/misc/lib_context.c b/lib/misc/lib_context.c
index f1995e1..00023e7 100644
--- a/lib/misc/lib_context.c
+++ b/lib/misc/lib_context.c
@@ -138,25 +138,30 @@ init_paths(struct lib_context *lc, void *arg)
 static void
 init_version(struct lib_context *lc, void *arg)
 {
-	lc->version.text = DMRAID_LIB_VERSION;
+	static char version[80];
+
+	lc->version.text = version;
 	lc->version.date = DMRAID_LIB_DATE;
 	lc->version.v.major = DMRAID_LIB_MAJOR_VERSION;
 	lc->version.v.minor = DMRAID_LIB_MINOR_VERSION;
 	lc->version.v.sub_minor = DMRAID_LIB_SUBMINOR_VERSION;
 	lc->version.v.suffix = DMRAID_LIB_VERSION_SUFFIX;
+	snprintf(version, sizeof(version), "%d.%d.%d.%s",
+		 lc->version.v.major, lc->version.v.minor,
+		 lc->version.v.sub_minor, lc->version.v.suffix);
 }
 
 /* Put init functions into an array because of the potentially growing list. */
 struct init_fn {
 	void (*func) (struct lib_context * lc, void *arg);
 } init_fn[] = {
-	{
-	init_options}, {
-	init_cmd}, {
-	init_lists}, {
-	init_mode}, {
-	init_paths}, {
-init_version},};
+	{ init_options},
+	{ init_cmd},
+	{ init_lists},
+	{ init_mode},
+	{ init_paths},
+	{ init_version},
+};
 
 struct lib_context *
 alloc_lib_context(char **argv)


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- dmraid.spec	19 Jan 2010 16:40:47 -0000	1.117
+++ dmraid.spec	20 Jan 2010 16:13:53 -0000	1.118
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -31,6 +31,7 @@ Patch4: fix_sil_jbod.patch
 Patch5: avoid_register.patch
 Patch6: move_pattern_file_to_var.patch
 Patch7: libversion.patch
+Patch8: libversion-display.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -78,6 +79,7 @@ Device failure reporting has to be activ
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %define _libdir /%{_lib}
@@ -150,6 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
 
 %changelog
+* Wed Jan 20 2010  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-11
+- return full internal library name as a combination of library
+  major, minor, subminor and suffix numbers on calls to libdmraid_version()
+- Related: bz#556863
+
 * Tue Jan 19 2010  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-10
 - change libdmraid version to 1
 - Resolves: bz#556863