>From c38cac87ed36de7271f0c3da52170fa880078745 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 14 Apr 2014 08:28:49 +0200 Subject: [PATCH 1/2] Bump version-info The soname of libcollection is changed, we can unify versions in version script --- Makefile.am | 12 ++++++------ collection/libcollection.sym | 9 ++------- contrib/ding-libs.spec.in | 16 ++++++++-------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7bca2d25155be726c4f0890983c6965284f371bb..b95cb62a0265690dc37895a1ec7305c55c8693f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ dist_include_HEADERS += path_utils/path_utils.h libpath_utils_la_SOURCES = path_utils/path_utils.c libpath_utils_la_DEPENDENCIES = path_utils/libpath_utils.sym libpath_utils_la_LDFLAGS = \ - -version-info 1:0:0 \ + -version-info 1:1:0 \ -Wl,--version-script=$(top_srcdir)/path_utils/libpath_utils.sym if HAVE_CHECK @@ -100,7 +100,7 @@ dist_include_HEADERS += dhash/dhash.h libdhash_la_SOURCES = dhash/dhash.c libdhash_la_DEPENDENCIES = dhash/libdhash.sym libdhash_la_LDFLAGS = \ - -version-info 1:1:0 \ + -version-info 1:2:0 \ -Wl,--version-script=$(top_srcdir)/dhash/libdhash.sym check_PROGRAMS += dhash_test dhash_example @@ -142,7 +142,7 @@ libcollection_la_SOURCES = \ trace/trace.h libcollection_la_DEPENDENCIES = collection/libcollection.sym libcollection_la_LDFLAGS = \ - -version-info 3:0:1 \ + -version-info 3:0:0 \ -Wl,--version-script=$(top_srcdir)/collection/libcollection.sym check_PROGRAMS += \ @@ -180,7 +180,7 @@ libref_array_la_SOURCES = \ trace/trace.h libref_array_la_DEPENDENCIES = refarray/libref_array.sym libref_array_la_LDFLAGS = \ - -version-info 2:0:1 \ + -version-info 3:0:2 \ -Wl,--version-script=$(top_srcdir)/refarray/libref_array.sym check_PROGRAMS += ref_array_ut @@ -209,7 +209,7 @@ libbasicobjects_la_SOURCES = \ trace/trace.h libbasicobjects_la_DEPENDENCIES = basicobjects/libbasicobjects.sym libbasicobjects_la_LDFLAGS = \ - -version-info 0:0:0 \ + -version-info 1:0:1 \ -Wl,--version-script=$(top_srcdir)/basicobjects/libbasicobjects.sym check_PROGRAMS += simplebuffer_ut @@ -263,7 +263,7 @@ libini_config_la_LIBADD = \ libref_array.la \ libbasicobjects.la libini_config_la_LDFLAGS = \ - -version-info 4:0:1 \ + -version-info 4:0:0 \ -Wl,--version-script=$(top_srcdir)/ini/libini_config.sym dist_noinst_DATA += \ diff --git a/collection/libcollection.sym b/collection/libcollection.sym index e526636151f459af98dc0f45319439a7f49006ed..9110cae513482564cf43e1b7892a5a208d32a2d0 100644 --- a/collection/libcollection.sym +++ b/collection/libcollection.sym @@ -1,8 +1,9 @@ -COLLECTION_0.6.0 { +COLLECTION_0.6.2 { global: /* collection.h */ col_create_collection; col_destroy_collection; + col_destroy_collection_with_cb; col_copy_collection_with_cb; col_copy_collection; col_add_collection_to_collection; @@ -142,9 +143,3 @@ global: local: *; }; - -COLLECTION_0.6.2 { -global: - /* collection.h */ - col_destroy_collection_with_cb; -} COLLECTION_0.6.0; diff --git a/contrib/ding-libs.spec.in b/contrib/ding-libs.spec.in index d5da0aa2df313be37ad13c7bad5b5b6a248dcc37..206ee846f262777294cd139f60747d6603730b22 100644 --- a/contrib/ding-libs.spec.in +++ b/contrib/ding-libs.spec.in @@ -87,7 +87,7 @@ Utility functions to manipulate filesystem pathnames %defattr(-,root,root,-) %doc COPYING COPYING.LESSER %{_libdir}/libpath_utils.so.1 -%{_libdir}/libpath_utils.so.1.0.0 +%{_libdir}/libpath_utils.so.1.0.1 %files -n libpath_utils-devel %defattr(-,root,root,-) @@ -130,7 +130,7 @@ time properties %defattr(-,root,root,-) %doc COPYING COPYING.LESSER %{_libdir}/libdhash.so.1 -%{_libdir}/libdhash.so.1.0.1 +%{_libdir}/libdhash.so.1.0.2 %files -n libdhash-devel %defattr(-,root,root,-) @@ -173,8 +173,8 @@ and serialization %defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER -%{_libdir}/libcollection.so.2 -%{_libdir}/libcollection.so.2.1.0 +%{_libdir}/libcollection.so.3 +%{_libdir}/libcollection.so.3.0.0 %files -n libcollection-devel %defattr(-,root,root,-) @@ -218,7 +218,7 @@ A dynamically-growing, reference-counted array %doc COPYING %doc COPYING.LESSER %{_libdir}/libref_array.so.1 -%{_libdir}/libref_array.so.1.1.0 +%{_libdir}/libref_array.so.1.2.0 %files -n libref_array-devel %defattr(-,root,root,-) @@ -259,7 +259,7 @@ Basic object types %doc COPYING %doc COPYING.LESSER %{_libdir}/libbasicobjects.so.0 -%{_libdir}/libbasicobjects.so.0.0.0 +%{_libdir}/libbasicobjects.so.0.1.0 %files -n libbasicobjects-devel %defattr(-,root,root,-) @@ -302,8 +302,8 @@ structure %defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER -%{_libdir}/libini_config.so.3 -%{_libdir}/libini_config.so.3.1.0 +%{_libdir}/libini_config.so.4 +%{_libdir}/libini_config.so.4.0.0 %files -n libini_config-devel %defattr(-,root,root,-) -- 1.9.0