Skip to content

Commit

Permalink
fix library versioning to avoid crash (bsc#1143182, bsc#1132977)
Browse files Browse the repository at this point in the history
  • Loading branch information
rtorrero committed Sep 25, 2019
1 parent caac162 commit 2b09245
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions configure.ac
Expand Up @@ -9,20 +9,16 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip subdir-objects])
#
# Note: We consider libwicked as an internal helper library,
# rather than a general purporse library with rock solid ABI.
# The program/package version and the library version do not
# correspond 1:1 with each other, the version is encoded.
# We intentionally break binary compatibility at minor level.
# We intentionally break binary compatibility at rev level.
#
set -- ${VERSION//./ }
MAJ=$(($1))
MIN=$(($2))
REV=$(($3))
# optional fix/patch level
FIX=0

# Calculate package (soname version) suffix for the spec file.
AC_SUBST(LIBWICKED_PACKAGE_SUFFIX, "-${MAJ}-${MIN}")
AC_SUBST(LIBWICKED_LTLINK_VERSION, "-release ${MAJ} -version-number ${MIN}:${REV}:${FIX}")
AC_SUBST(LIBWICKED_PACKAGE_SUFFIX, "-${MAJ}_${MIN}_${REV}")
AC_SUBST(LIBWICKED_LTLINK_VERSION, "-release ${MAJ}.${MIN}.${REV}")

#AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/config.c])
Expand Down
4 changes: 2 additions & 2 deletions wicked.spec.in
Expand Up @@ -239,7 +239,7 @@ ln -sf %_sysconfdir/init.d/network ${RPM_BUILD_ROOT}%_sbindir/rcnetwork
%if %{without wicked_devel}
pushd $RPM_BUILD_ROOT
rm -rfv \
.%_libdir/libwicked*.so \
.%_libdir/libwicked.so \
.%_datadir/pkgconfig/wicked.pc \
.%_mandir/man7/wicked.7* \
.%_includedir/wicked
Expand Down Expand Up @@ -437,6 +437,6 @@ fi

%files -n libwicked@LIBWICKED_PACKAGE_SUFFIX@
%defattr (-,root,root)
%_libdir/libwicked*.so.*
%_libdir/libwicked-*.so*

%changelog

0 comments on commit 2b09245

Please sign in to comment.