From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Nov 2014 13:01:03 +0000 (+0100)
Subject: build-sys: cleanup library symbol files
X-Git-Tag: v2.26-rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc9f78cfcfbeedeb8577da2fa2834daeb99c0b1;p=thirdparty%2Futil-linux.git

build-sys: cleanup library symbol files

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index d9f927655c..7682958fe5 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -112,7 +112,7 @@ libblkid_la_LIBADD = libcommon.la
 
 libblkid_la_DEPENDENCIES = \
 	libcommon.la \
-	libblkid/src/blkid.sym \
+	libblkid/src/libblkid.sym \
 	libblkid/src/blkid.h.in
 
 libblkid_la_CFLAGS = \
@@ -128,11 +128,11 @@ endif
 
 libblkid_la_LDFLAGS = \
 	$(SOLIB_LDFLAGS) \
-	-Wl,--version-script=$(top_srcdir)/libblkid/src/blkid.sym \
+	-Wl,--version-script=$(top_srcdir)/libblkid/src/libblkid.sym \
 	-version-info $(LIBBLKID_VERSION_INFO)
 
 EXTRA_DIST += \
-	libblkid/src/blkid.sym \
+	libblkid/src/libblkid.sym \
 	libblkid/src/blkid.h.in
 
 if BUILD_LIBBLKID_TESTS
diff --git a/libblkid/src/blkid.sym b/libblkid/src/libblkid.sym
similarity index 96%
rename from libblkid/src/blkid.sym
rename to libblkid/src/libblkid.sym
index 80cb4d487a..6b3cf08054 100644
--- a/libblkid/src/blkid.sym
+++ b/libblkid/src/libblkid.sym
@@ -1,10 +1,12 @@
 /*
- * The symbol versioning ensures that a new application requiring symbol foo()
- * can't run with old libblkid.so not providing foo() - the global SONAME
+ * The symbol versioning ensures that a new application requiring symbol 'foo'
+ * can't run with old library.so not providing 'foo' - the global SONAME
  * version info can't enforce this since we never change the SONAME.
  *
  * The original libblkid from e2fsprogs (<=1.41.4) does not to use
  * symbol versioning -- all the original symbols are in BLKID_1.0 now.
+ *
+ * Copyright (C) 2009-2014 Karel Zak <kzak@redhat.com> 
  */
 BLKID_1.0 {
 global:
diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index d827c31013..56170abc2b 100644
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -1,7 +1,10 @@
 /*
- * The symbol versioning ensures that a new application requiring symbol foo;
- * can't run with old libblkid.so not providing foo;
- * version info can't enforce this since we never change the SONAME.
+ * The symbol versioning ensures that a new application requiring symbol foo,
+ * can't run with old library.so not providing foo.
+ *
+ * Version info can't enforce this since we never change the SONAME.
+ *
+ * Copyright (C) 2011-2014 Karel Zak <kzak@redhat.com> 
  */
 MOUNT_2.19 {
 global:
diff --git a/libsmartcols/src/libsmartcols.sym b/libsmartcols/src/libsmartcols.sym
index a4de524f41..2629213c19 100644
--- a/libsmartcols/src/libsmartcols.sym
+++ b/libsmartcols/src/libsmartcols.sym
@@ -1,5 +1,7 @@
 /*
  * symbols since util-linux 2.25
+ *
+ * Copyright (C) 2014 Karel Zak <kzak@redhat.com>
  */
 SMARTCOLS_2.25 {
 global:
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index a5fd561cf2..061aff21d6 100644
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -27,7 +27,7 @@ libuuid_la_SOURCES = \
 	$(uuidinc_HEADERS) \
 	lib/randutils.c
 
-libuuid_la_DEPENDENCIES = libuuid/src/uuid.sym
+libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym
 libuuid_la_LIBADD       = $(SOCKET_LIBS)
 
 libuuid_la_CFLAGS = \
@@ -37,10 +37,10 @@ libuuid_la_CFLAGS = \
 
 libuuid_la_LDFLAGS = \
 	$(SOLIB_LDFLAGS) \
-	-Wl,--version-script=$(top_srcdir)/libuuid/src/uuid.sym \
+	-Wl,--version-script=$(top_srcdir)/libuuid/src/libuuid.sym \
 	-version-info $(LIBUUID_VERSION_INFO)
 
-EXTRA_DIST += libuuid/src/uuid.sym
+EXTRA_DIST += libuuid/src/libuuid.sym
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed
 install-exec-hook-libuuid:
diff --git a/libuuid/src/uuid.sym b/libuuid/src/libuuid.sym
similarity index 84%
rename from libuuid/src/uuid.sym
rename to libuuid/src/libuuid.sym
index 2cad51bc6f..28a207684a 100644
--- a/libuuid/src/uuid.sym
+++ b/libuuid/src/libuuid.sym
@@ -1,10 +1,12 @@
 /*
- * The symbol versioning ensures that a new application requiring symbol foo()
- * can't run with old libuuid.so not providing foo() - the global SONAME
+ * The symbol versioning ensures that a new application requiring symbol 'foo'
+ * can't run with old libbrary.so not providing 'foo' - the global SONAME
  * version info can't enforce this since we never change the SONAME.
  *
  * The original libuuid from e2fsprogs (<=1.41.5) does not to use
  * symbol versioning -- all the original symbols are in UUID_1.0 now.
+ *
+ * Copyright (C) 2011-2014 Karel Zak <kzak@redhat.com>
  */
 UUID_1.0 {
 global: