[SSSD] [DING-LIBS] [PATCH] Bump version-info
Lukas Slebodnik
lslebodn at redhat.com
Tue Jun 23 11:48:07 UTC 2015
On (23/06/15 13:26), Jakub Hrozek wrote:
>On Tue, Jun 23, 2015 at 01:00:39PM +0200, Lukas Slebodnik wrote:
>> On (23/06/15 11:31), Jakub Hrozek wrote:
>> >On Tue, Jun 23, 2015 at 11:06:08AM +0200, Lukas Slebodnik wrote:
>> >> ehlo,
>> >>
>> >> simple patch is attached.
>> >>
>> >> LS
>> >
>> >> From 764e6e398487d585214b9b66388e74546390a973 Mon Sep 17 00:00:00 2001
>> >> From: Lukas Slebodnik <lslebodn at redhat.com>
>> >> Date: Tue, 23 Jun 2015 10:57:19 +0200
>> >> Subject: [PATCH] Bump version-info
>> >>
>> >> The function ref_array_debug was updated. There wasn't any other
>> >> changes to ref_array.
>> >>
>> >> New functions were added to collections:
>> >> col_get_dup_item, col_delete_item_with_cb, col_remove_item_with_cb
>> >>
>> >> New functions were added to ini_config:
>> >> ini_config_augment, ini_comment_construct and many functions
>> >> from ini_configmod.h
>> >> ---
>> >> Makefile.am | 6 +++---
>> >> version.m4 | 6 +++---
>> >> 2 files changed, 6 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/Makefile.am b/Makefile.am
>> >> index e37884e612f23acddbb10e7a1f46eacc78908ef8..5b1da336189cb783ebc23f4241cb2bcb16fa16d7 100644
>> >> --- a/Makefile.am
>> >> +++ b/Makefile.am
>> >> @@ -142,7 +142,7 @@ libcollection_la_SOURCES = \
>> >> trace/trace.h
>> >> libcollection_la_DEPENDENCIES = collection/libcollection.sym
>> >> libcollection_la_LDFLAGS = \
>> >> - -version-info 4:0:0 \
>> >> + -version-info 5:0:1 \
>> >
>> >We follow these rules from
>> >https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
>> >
>> > - If the library source code has changed at all since the last update,
>> > then increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
>> > - If any interfaces have been added, removed, or changed since the last
>> > update, increment current, and set revision to 0.
>> > - If any interfaces have been added since the last public release, then
>> > increment age.
>> >
>> >-> ACK
>> >
>> >
>> >> -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 3:0:2 \
>> >> + -version-info 3:1:2 \
>> >> -Wl,--version-script=$(top_srcdir)/refarray/libref_array.sym
>> >
>> >Here we only follow:
>> > - If the library source code has changed at all since the last update,
>> > then increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
>> >
>> >-> ACK
>> >
>> >>
>> >> check_PROGRAMS += ref_array_ut
>> >> @@ -268,7 +268,7 @@ libini_config_la_LIBADD = \
>> >> libref_array.la \
>> >> libbasicobjects.la
>> >> libini_config_la_LDFLAGS = \
>> >> - -version-info 5:0:0 \
>> >> + -version-info 6:0:1 \
>> >
>> >Here we follow the same rules as with libcollection.
>> >
>> >> -Wl,--version-script=$(top_srcdir)/ini/libini_config.sym
>> >>
>> >> dist_noinst_DATA += \
>> >> diff --git a/version.m4 b/version.m4
>> >> index 45ff9e247ab8bfc0a9dcc2776989978bc709bfa4..8f4ce544134230488659cf7f379f8e73c2c33776 100644
>> >
>> >The changes are fine, but should be a different patch.
>> >
>> No problem two patches are attached.
>
>Thank you, ACK to both. btw I also checked how the resulting symlinks
>look like. For libcollection libcollection.so.4.1.0 appeared but 4.0.0
>stays, similarly for libini_config 5.1.0 appeared in addition to 5.0.0.
>For libref_array, 1.2.0 stays
I forgot to update spec file.
Updated patches are attached.
LS
-------------- next part --------------
>From 85fd9d148778e7990cd073de7db554c181838395 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 23 Jun 2015 12:50:53 +0200
Subject: [PATCH 1/2] Bump version-info
The function ref_array_debug was updated. There wasn't any other
changes to ref_array.
New functions were added to collections:
col_get_dup_item, col_delete_item_with_cb, col_remove_item_with_cb
New functions were added to ini_config:
ini_config_augment, ini_comment_construct and many functions
from ini_configmod.h
---
Makefile.am | 6 +++---
contrib/ding-libs.spec.in | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e37884e612f23acddbb10e7a1f46eacc78908ef8..5b1da336189cb783ebc23f4241cb2bcb16fa16d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,7 +142,7 @@ libcollection_la_SOURCES = \
trace/trace.h
libcollection_la_DEPENDENCIES = collection/libcollection.sym
libcollection_la_LDFLAGS = \
- -version-info 4:0:0 \
+ -version-info 5:0:1 \
-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 3:0:2 \
+ -version-info 3:1:2 \
-Wl,--version-script=$(top_srcdir)/refarray/libref_array.sym
check_PROGRAMS += ref_array_ut
@@ -268,7 +268,7 @@ libini_config_la_LIBADD = \
libref_array.la \
libbasicobjects.la
libini_config_la_LDFLAGS = \
- -version-info 5:0:0 \
+ -version-info 6:0:1 \
-Wl,--version-script=$(top_srcdir)/ini/libini_config.sym
dist_noinst_DATA += \
diff --git a/contrib/ding-libs.spec.in b/contrib/ding-libs.spec.in
index 54d8b9712b3597b2f6c91a37c102754d33825b37..fe180ffb85d7f338345a19b93ee74a954bc3b8cf 100644
--- a/contrib/ding-libs.spec.in
+++ b/contrib/ding-libs.spec.in
@@ -174,7 +174,7 @@ and serialization
%doc COPYING
%doc COPYING.LESSER
%{_libdir}/libcollection.so.4
-%{_libdir}/libcollection.so.4.0.0
+%{_libdir}/libcollection.so.4.1.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.2.0
+%{_libdir}/libref_array.so.1.2.1
%files -n libref_array-devel
%defattr(-,root,root,-)
@@ -303,7 +303,7 @@ structure
%doc COPYING
%doc COPYING.LESSER
%{_libdir}/libini_config.so.5
-%{_libdir}/libini_config.so.5.0.0
+%{_libdir}/libini_config.so.5.1.0
%files -n libini_config-devel
%defattr(-,root,root,-)
--
2.4.3
-------------- next part --------------
>From 45e3f2cb05fa521d9bffb9470a2a2b2fce7b9424 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 23 Jun 2015 12:51:13 +0200
Subject: [PATCH 2/2] Update versions before 0.5.0 release
Version for libcollection was already updated
with patch:
df4d87161410bb6ab11105e74d2232cca6730f8b
Function to return one of the dups
---
version.m4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/version.m4 b/version.m4
index 45ff9e247ab8bfc0a9dcc2776989978bc709bfa4..8f4ce544134230488659cf7f379f8e73c2c33776 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
# Primary version number
-m4_define([VERSION_NUMBER], [0.4.0])
+m4_define([VERSION_NUMBER], [0.5.0])
# If the PRERELEASE_VERSION_NUMBER is set, we'll append
# it to the release tag when creating an RPM or SRPM
@@ -13,6 +13,6 @@ m4_define([PRERELEASE_VERSION_NUMBER], [])
m4_define([PATH_UTILS_VERSION_NUMBER], [0.2.1])
m4_define([DHASH_VERSION_NUMBER], [0.4.3])
m4_define([COLLECTION_VERSION_NUMBER], [0.7.0])
-m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.4])
+m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.5])
m4_define([BASICOBJECTS_VERSION_NUMBER], [0.1.1])
-m4_define([INI_CONFIG_VERSION_NUMBER], [1.1.0])
+m4_define([INI_CONFIG_VERSION_NUMBER], [1.2.0])
--
2.4.3
More information about the sssd-devel
mailing list