Hello community, here is the log from the commit of package wicked for openSUSE:Factory checked in at 2019-10-09 15:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wicked (Old) and /work/SRC/openSUSE:Factory/.wicked.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked" Wed Oct 9 15:17:52 2019 rev:78 rq:734983 version:0.6.60 Changes: -------- --- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2019-09-25 01:54:35.113597012 +0200 +++ /work/SRC/openSUSE:Factory/.wicked.new.2352/wicked.changes 2019-10-09 15:17:57.476730084 +0200 @@ -1,0 +2,7 @@ +Fri Oct 4 11:41:32 UTC 2019 - [email protected] + +- version 0.6.60 +- libwicked: fix versioning and packaging (bsc#1143182,bsc#1132977) + shipping the internal helper library inside of the wicked package. + +------------------------------------------------------------------- Old: ---- wicked-0.6.57.tar.bz2 New: ---- wicked-0.6.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wicked.spec ++++++ --- /var/tmp/diff_new_pack.j3Egj7/_old 2019-10-09 15:17:58.008728715 +0200 +++ /var/tmp/diff_new_pack.j3Egj7/_new 2019-10-09 15:17:58.012728704 +0200 @@ -18,7 +18,7 @@ %define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0} Name: wicked -Version: 0.6.57 +Version: 0.6.60 Release: %{release_prefix}.0.0 Summary: Network configuration infrastructure License: GPL-2.0 @@ -39,7 +39,8 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: make -Requires(pre): libwicked-0-6 = %{version} +Provides: libwicked-0_6_60 = %{version} +Obsoletes: libwicked-0-6 <= %{version} %if 0%{?suse_version} >= 1500 %bcond_without rfc4361_cid @@ -154,7 +155,7 @@ Group: Development/Libraries/C and C++ Requires: dbus-1-devel Requires: libnl3-devel -Requires: libwicked-0-6 = %{version} +Requires: libwicked-0_6_60 = %{version} %description devel Wicked is a network configuration infrastructure incorporating a number @@ -164,19 +165,6 @@ This package provides the wicked development files. %endif -%package -n libwicked-0-6 -Summary: Network configuration infrastructure - Shared library -Group: System/Management -Obsoletes: libwicked0 < %{version} - -%description -n libwicked-0-6 -Wicked is a network configuration infrastructure incorporating a number -of existing frameworks into a unified architecture, providing a DBUS -interface to network configuration. - -This package provides the wicked shared library. - - %prep %setup @@ -239,7 +227,7 @@ %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 @@ -297,19 +285,15 @@ %endif -%post -n libwicked-0-6 -/sbin/ldconfig - -%postun -n libwicked-0-6 -/sbin/ldconfig - %post +/sbin/ldconfig %{fillup_only -dns config wicked network} %{fillup_only -dns dhcp wicked network} # reload dbus after install or upgrade to apply new policies /usr/bin/systemctl reload dbus.service 2>/dev/null || : %postun +/sbin/ldconfig # reload dbus after uninstall, our policies are gone again if [ ${FIRST_ARG:-$1} -eq 0 ]; then /usr/bin/systemctl reload dbus.service 2>/dev/null || : @@ -321,6 +305,7 @@ %_sbindir/wicked %_sbindir/wickedd %_sbindir/wickedd-nanny +%_libdir/libwicked-*.so* %dir %_libexecdir/%{name} %dir %_libexecdir/%{name}/bin %_libexecdir/%{name}/bin/wickedd-auto4 @@ -430,13 +415,9 @@ %defattr (-,root,root) %dir %_includedir/wicked %_includedir/wicked/* -%_libdir/libwicked*.so +%_libdir/libwicked.so %_datadir/pkgconfig/wicked.pc %_mandir/man7/wicked.7* %endif -%files -n libwicked-0-6 -%defattr (-,root,root) -%_libdir/libwicked*.so.* - %changelog ++++++ wicked-0.6.57.tar.bz2 -> wicked-0.6.60.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/ChangeLog new/wicked-0.6.60/ChangeLog --- old/wicked-0.6.57/ChangeLog 2019-09-19 18:34:43.000000000 +0200 +++ new/wicked-0.6.60/ChangeLog 2019-10-04 13:52:56.000000000 +0200 @@ -1,3 +1,21 @@ +commit d1dfb7246d43c20094515ef07fea1760a964ce7d +Author: Marius Tomaschewski <[email protected]> +Date: Fri Oct 4 13:10:56 2019 +0200 + + version 0.6.60 + +commit 16879eea8c1b8c26f9e79166fd490b2d148b7617 +Author: Rubén Torrero Marijnissen <[email protected]> +Date: Wed Sep 25 17:31:30 2019 +0100 + + spec: move internal libwicked library into the wicked package + +commit 2b092458e61b644e19860c4e28ff3c4564095814 +Author: Rubén Torrero Marijnissen <[email protected]> +Date: Mon Sep 23 14:42:28 2019 +0200 + + fix library versioning to avoid crash (bsc#1143182, bsc#1132977) + commit caac162b5a8784d65babfaea60c87446cec00607 Author: Marius Tomaschewski <[email protected]> Date: Thu Sep 19 18:29:25 2019 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/VERSION new/wicked-0.6.60/VERSION --- old/wicked-0.6.57/VERSION 2019-09-19 18:29:17.000000000 +0200 +++ new/wicked-0.6.60/VERSION 2019-10-04 13:35:15.000000000 +0200 @@ -1 +1 @@ -0.6.57 +0.6.60 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/configure new/wicked-0.6.60/configure --- old/wicked-0.6.57/configure 2019-09-19 18:33:48.000000000 +0200 +++ new/wicked-0.6.60/configure 2019-10-04 13:35:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wicked 0.6.57. +# Generated by GNU Autoconf 2.69 for wicked 0.6.60. # # Report bugs to <http://bugs.opensuse.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='wicked' PACKAGE_TARNAME='wicked' -PACKAGE_VERSION='0.6.57' -PACKAGE_STRING='wicked 0.6.57' +PACKAGE_VERSION='0.6.60' +PACKAGE_STRING='wicked 0.6.60' PACKAGE_BUGREPORT='http://bugs.opensuse.org' PACKAGE_URL='https://github.com/openSUSE/wicked' @@ -1396,7 +1396,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wicked 0.6.57 to adapt to many kinds of systems. +\`configure' configures wicked 0.6.60 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1466,7 +1466,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wicked 0.6.57:";; + short | recursive ) echo "Configuration of wicked 0.6.60:";; esac cat <<\_ACEOF @@ -1637,7 +1637,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wicked configure 0.6.57 +wicked configure 0.6.60 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2236,7 +2236,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wicked $as_me 0.6.57, which was +It was created by wicked $as_me 0.6.60, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3099,7 +3099,7 @@ # Define the identity of the package. PACKAGE='wicked' - VERSION='0.6.57' + VERSION='0.6.60' cat >>confdefs.h <<_ACEOF @@ -3196,21 +3196,17 @@ # # 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. -LIBWICKED_PACKAGE_SUFFIX="-${MAJ}-${MIN}" +LIBWICKED_PACKAGE_SUFFIX="-${MAJ}_${MIN}_${REV}" -LIBWICKED_LTLINK_VERSION="-release ${MAJ} -version-number ${MIN}:${REV}:${FIX}" +LIBWICKED_LTLINK_VERSION="-release ${MAJ}.${MIN}.${REV}" #AC_CONFIG_MACRO_DIR([m4]) @@ -15814,7 +15810,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wicked $as_me 0.6.57, which was +This file was extended by wicked $as_me 0.6.60, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15881,7 +15877,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wicked config.status 0.6.57 +wicked config.status 0.6.60 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/configure.ac new/wicked-0.6.60/configure.ac --- old/wicked-0.6.57/configure.ac 2019-07-26 15:27:40.000000000 +0200 +++ new/wicked-0.6.60/configure.ac 2019-10-04 13:35:15.000000000 +0200 @@ -9,20 +9,16 @@ # # 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]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/wicked.spec new/wicked-0.6.60/wicked.spec --- old/wicked-0.6.57/wicked.spec 2019-09-19 18:33:54.000000000 +0200 +++ new/wicked-0.6.60/wicked.spec 2019-10-04 13:35:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wicked # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0} Name: wicked -Version: 0.6.57 +Version: 0.6.60 Release: %{release_prefix}.0.0 Summary: Network configuration infrastructure License: GPL-2.0 @@ -39,7 +39,8 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: make -Requires(pre): libwicked-0-6 = %{version} +Provides: libwicked-0_6_60 = %{version} +Obsoletes: libwicked-0-6 <= %{version} %if 0%{?suse_version} >= 1500 %bcond_without rfc4361_cid @@ -83,8 +84,8 @@ %endif %if %{with systemd} -BuildRequires: systemd-devel -BuildRequires: systemd-rpm-macros +BuildRequires: systemd-devel +BuildRequires: systemd-rpm-macros %{?systemd_requires} %if 0%{?suse_version:1} Requires(pre): %fillup_prereq @@ -154,7 +155,7 @@ Group: Development/Libraries/C and C++ Requires: dbus-1-devel Requires: libnl3-devel -Requires: libwicked-0-6 = %{version} +Requires: libwicked-0_6_60 = %{version} %description devel Wicked is a network configuration infrastructure incorporating a number @@ -164,19 +165,6 @@ This package provides the wicked development files. %endif -%package -n libwicked-0-6 -Summary: Network configuration infrastructure - Shared library -Group: System/Management -Obsoletes: libwicked0 < %{version} - -%description -n libwicked-0-6 -Wicked is a network configuration infrastructure incorporating a number -of existing frameworks into a unified architecture, providing a DBUS -interface to network configuration. - -This package provides the wicked shared library. - - %prep %setup @@ -239,7 +227,7 @@ %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 @@ -297,19 +285,15 @@ %endif -%post -n libwicked-0-6 -/sbin/ldconfig - -%postun -n libwicked-0-6 -/sbin/ldconfig - %post +/sbin/ldconfig %{fillup_only -dns config wicked network} %{fillup_only -dns dhcp wicked network} # reload dbus after install or upgrade to apply new policies /usr/bin/systemctl reload dbus.service 2>/dev/null || : %postun +/sbin/ldconfig # reload dbus after uninstall, our policies are gone again if [ ${FIRST_ARG:-$1} -eq 0 ]; then /usr/bin/systemctl reload dbus.service 2>/dev/null || : @@ -321,6 +305,7 @@ %_sbindir/wicked %_sbindir/wickedd %_sbindir/wickedd-nanny +%_libdir/libwicked-*.so* %dir %_libexecdir/%{name} %dir %_libexecdir/%{name}/bin %_libexecdir/%{name}/bin/wickedd-auto4 @@ -430,13 +415,10 @@ %defattr (-,root,root) %dir %_includedir/wicked %_includedir/wicked/* -%_libdir/libwicked*.so +%_libdir/libwicked.so %_datadir/pkgconfig/wicked.pc %_mandir/man7/wicked.7* %endif -%files -n libwicked-0-6 -%defattr (-,root,root) -%_libdir/libwicked*.so.* %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.57/wicked.spec.in new/wicked-0.6.60/wicked.spec.in --- old/wicked-0.6.57/wicked.spec.in 2019-07-26 15:27:41.000000000 +0200 +++ new/wicked-0.6.60/wicked.spec.in 2019-10-04 13:35:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wicked # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,8 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: make -Requires(pre): libwicked@LIBWICKED_PACKAGE_SUFFIX@ = %{version} +Provides: libwicked@LIBWICKED_PACKAGE_SUFFIX@ = %{version} +Obsoletes: libwicked-0-6 <= %{version} %if 0%{?suse_version} >= 1500 %bcond_without rfc4361_cid @@ -83,8 +84,8 @@ %endif %if %{with systemd} -BuildRequires: systemd-devel -BuildRequires: systemd-rpm-macros +BuildRequires: systemd-devel +BuildRequires: systemd-rpm-macros %{?systemd_requires} %if 0%{?suse_version:1} Requires(pre): %fillup_prereq @@ -164,19 +165,6 @@ This package provides the wicked development files. %endif -%package -n libwicked@LIBWICKED_PACKAGE_SUFFIX@ -Summary: Network configuration infrastructure - Shared library -Group: System/Management -Obsoletes: libwicked0 < %{version} - -%description -n libwicked@LIBWICKED_PACKAGE_SUFFIX@ -Wicked is a network configuration infrastructure incorporating a number -of existing frameworks into a unified architecture, providing a DBUS -interface to network configuration. - -This package provides the wicked shared library. - - %prep %setup @@ -239,7 +227,7 @@ %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 @@ -297,19 +285,15 @@ %endif -%post -n libwicked@LIBWICKED_PACKAGE_SUFFIX@ -/sbin/ldconfig - -%postun -n libwicked@LIBWICKED_PACKAGE_SUFFIX@ -/sbin/ldconfig - %post +/sbin/ldconfig %{fillup_only -dns config wicked network} %{fillup_only -dns dhcp wicked network} # reload dbus after install or upgrade to apply new policies /usr/bin/systemctl reload dbus.service 2>/dev/null || : %postun +/sbin/ldconfig # reload dbus after uninstall, our policies are gone again if [ ${FIRST_ARG:-$1} -eq 0 ]; then /usr/bin/systemctl reload dbus.service 2>/dev/null || : @@ -321,6 +305,7 @@ %_sbindir/wicked %_sbindir/wickedd %_sbindir/wickedd-nanny +%_libdir/libwicked-*.so* %dir %_libexecdir/%{name} %dir %_libexecdir/%{name}/bin %_libexecdir/%{name}/bin/wickedd-auto4 @@ -430,13 +415,10 @@ %defattr (-,root,root) %dir %_includedir/wicked %_includedir/wicked/* -%_libdir/libwicked*.so +%_libdir/libwicked.so %_datadir/pkgconfig/wicked.pc %_mandir/man7/wicked.7* %endif -%files -n libwicked@LIBWICKED_PACKAGE_SUFFIX@ -%defattr (-,root,root) -%_libdir/libwicked*.so.* %changelog
