Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tevent for openSUSE:Factory checked in at 2022-02-03 23:15:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tevent (Old) and /work/SRC/openSUSE:Factory/.tevent.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tevent" Thu Feb 3 23:15:53 2022 rev:39 rq:950773 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tevent/tevent-man.changes 2021-10-04 18:40:19.438092513 +0200 +++ /work/SRC/openSUSE:Factory/.tevent.new.1898/tevent-man.changes 2022-02-03 23:16:11.500733508 +0100 @@ -1,0 +2,5 @@ +Wed Feb 02 13:56:12 UTC 2022 - David Mulder <[email protected]> + +- Fix build on 15.3 (for the heimdal addc build), by bundling cmocka. + +------------------------------------------------------------------- tevent.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tevent-man.spec ++++++ --- /var/tmp/diff_new_pack.2ccioq/_old 2022-02-03 23:16:12.080729549 +0100 +++ /var/tmp/diff_new_pack.2ccioq/_new 2022-02-03 23:16:12.084729522 +0100 @@ -1,7 +1,7 @@ # # spec file for package tevent-man # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,12 @@ %define talloc_version 2.3.3 %define build_man 1 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +%define bundle_cmocka 0 +%else +%define bundle_cmocka 1 +%endif + %if %{build_man} Name: tevent-man BuildRequires: doxygen @@ -39,7 +45,9 @@ BuildRequires: python3-devel BuildRequires: python3-talloc >= %{talloc_version} BuildRequires: python3-talloc-devel >= %{talloc_version} +%if ! %{bundle_cmocka} BuildRequires: pkgconfig(cmocka) >= 1.1.3 +%endif %endif # build_man %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} @@ -134,6 +142,9 @@ # use the default optimization unset OPTIMIZATION %endif +%if %{bundle_cmocka} + BUNDLED_LIBS="cmocka" +%endif export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ @@ -141,7 +152,7 @@ --disable-rpath \ --disable-rpath-install \ --disable-silent-rules \ - --bundled-libraries=NONE \ + --bundled-libraries=NONE,${BUNDLED_LIBS} \ --builtin-libraries=replace \ " ./configure ${CONFIGURE_OPTIONS} @@ -187,6 +198,10 @@ %files -n libtevent0 %defattr(-,root,root) %{_libdir}/libtevent.so.* +%if %{bundle_cmocka} +%dir %{_libdir}/tevent +%{_libdir}/tevent/libcmocka-tevent.so +%endif %files -n libtevent-devel %defattr(-,root,root) ++++++ tevent.spec ++++++ --- /var/tmp/diff_new_pack.2ccioq/_old 2022-02-03 23:16:12.104729385 +0100 +++ /var/tmp/diff_new_pack.2ccioq/_new 2022-02-03 23:16:12.108729358 +0100 @@ -1,7 +1,7 @@ # # spec file for package tevent-man # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,12 @@ %define talloc_version 2.3.3 %define build_man 0 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +%define bundle_cmocka 0 +%else +%define bundle_cmocka 1 +%endif + %if %{build_man} Name: tevent-man BuildRequires: doxygen @@ -39,7 +45,9 @@ BuildRequires: python3-devel BuildRequires: python3-talloc >= %{talloc_version} BuildRequires: python3-talloc-devel >= %{talloc_version} +%if ! %{bundle_cmocka} BuildRequires: pkgconfig(cmocka) >= 1.1.3 +%endif %endif # build_man %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} @@ -134,6 +142,9 @@ # use the default optimization unset OPTIMIZATION %endif +%if %{bundle_cmocka} + BUNDLED_LIBS="cmocka" +%endif export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ @@ -141,7 +152,7 @@ --disable-rpath \ --disable-rpath-install \ --disable-silent-rules \ - --bundled-libraries=NONE \ + --bundled-libraries=NONE,${BUNDLED_LIBS} \ --builtin-libraries=replace \ " ./configure ${CONFIGURE_OPTIONS} @@ -187,6 +198,10 @@ %files -n libtevent0 %defattr(-,root,root) %{_libdir}/libtevent.so.* +%if %{bundle_cmocka} +%dir %{_libdir}/tevent +%{_libdir}/tevent/libcmocka-tevent.so +%endif %files -n libtevent-devel %defattr(-,root,root)
