Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package compat-usrmerge for openSUSE:Factory
checked in at 2021-09-11 22:24:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compat-usrmerge (Old)
and /work/SRC/openSUSE:Factory/.compat-usrmerge.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compat-usrmerge"
Sat Sep 11 22:24:08 2021 rev:4 rq:914526 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/compat-usrmerge/compat-usrmerge.changes
2021-06-20 19:37:44.553494251 +0200
+++
/work/SRC/openSUSE:Factory/.compat-usrmerge.new.1899/compat-usrmerge.changes
2021-09-11 22:24:09.271364371 +0200
@@ -1,0 +2,8 @@
+Fri Aug 27 06:35:26 UTC 2021 - Ludwig Nussel <[email protected]>
+
+- statically link xmv to avoid glibc 2.34 dependency
+ (__libc_start_main@GLIBC_2.34)
+- turn on filetriggers in main package. Needed for single transaction upgrades
+ (boo#1189788)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compat-usrmerge.spec ++++++
--- /var/tmp/diff_new_pack.BnvVMC/_old 2021-09-11 22:24:09.883364975 +0200
+++ /var/tmp/diff_new_pack.BnvVMC/_new 2021-09-11 22:24:09.883364975 +0200
@@ -35,6 +35,7 @@
Source6: usrmerge_binsbindeps.lua
Source7: usrmergefiles.py
BuildRequires: gcc
+BuildRequires: glibc-static
BuildRequires: pkgconfig(rpm)
%description
@@ -43,6 +44,7 @@
%package tools
Summary: UsrMerge tools
+Requires: (compat-usrmerge if compat-usrmerge)
# have to turn requires off this off to avoid pulling in stuff
# before filessytem.
# xmv has very minimal glibc requirements and could probably be
@@ -68,7 +70,7 @@
%build
gcc -Wall %optflags -o usrmergecheck %{SOURCE2} `pkg-config --libs rpm`
-gcc -Wall %optflags -o xmv %{SOURCE4}
+gcc -Wall %optflags -static -o xmv %{SOURCE4}
%install
install -D -m755 usrmergecheck %{buildroot}%{_bindir}/usrmergecheck
@@ -144,8 +146,6 @@
EOF
%endif
-%if 0%{?usrmerge_filetriggers}
-
%filetriggerin -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
require("usrmerge")
if posix.getenv("VERBOSE_FILETRIGGERS") then
@@ -186,8 +186,6 @@
io.flush()
end
-%endif
-
%files
%dir %{_rpmconfigdir}/lua
%{_rpmconfigdir}/lua/usrmerge.lua
