From 4dd25b596d61a9e00c2aa82d8771bd2445cb20bebb3299e1a58a2715030d3e27 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 27 Aug 2021 07:17:50 +0000 Subject: [PATCH] Accepting request 914525 from home:lnussel:usrmove - 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) OBS-URL: https://build.opensuse.org/request/show/914525 OBS-URL: https://build.opensuse.org/package/show/Base:System/compat-usrmerge?expand=0&rev=22 --- compat-usrmerge.changes | 8 ++++++++ compat-usrmerge.spec | 14 ++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/compat-usrmerge.changes b/compat-usrmerge.changes index f612632..698b601 100644 --- a/compat-usrmerge.changes +++ b/compat-usrmerge.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 27 06:35:26 UTC 2021 - Ludwig Nussel + +- 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) + ------------------------------------------------------------------- Tue Jun 15 15:27:41 UTC 2021 - Ludwig Nussel diff --git a/compat-usrmerge.spec b/compat-usrmerge.spec index 21cd687..6b6f803 100644 --- a/compat-usrmerge.spec +++ b/compat-usrmerge.spec @@ -35,6 +35,7 @@ Source5: usrmerge.attr Source6: usrmerge_binsbindeps.lua Source7: usrmergefiles.py BuildRequires: gcc +BuildRequires: glibc-static BuildRequires: pkgconfig(rpm) %description @@ -43,6 +44,7 @@ Scripts and data files related to UsrMerge %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 @@ binaries in /(s)bin. %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,9 +146,7 @@ end EOF %endif -%if 0%{?usrmerge_filetriggers} - -%filetriggerin -p -- %{_sbindir} %{_bindir} %{_libdir} +%filetriggerin -p -- %{_sbindir} %{_bindir} %{_libdir} require("usrmerge") if posix.getenv("VERBOSE_FILETRIGGERS") then usrmerge.debug = "%{nvr}(in)" @@ -158,7 +158,7 @@ while file do end io.flush() -%filetriggerpostun -p -- %{_sbindir} %{_bindir} %{_libdir} +%filetriggerpostun -p -- %{_sbindir} %{_bindir} %{_libdir} -- the module is already gone if we get called for ourselves if pcall(require, 'usrmerge') then if posix.getenv("VERBOSE_FILETRIGGERS") then @@ -172,7 +172,7 @@ if pcall(require, 'usrmerge') then io.flush() end -%filetriggerpostun -p -- /sbin /bin /%{_lib} +%filetriggerpostun -p -- /sbin /bin /%{_lib} -- the module is already gone if we get called for ourselves if pcall(require, 'usrmerge') then if posix.getenv("VERBOSE_FILETRIGGERS") then @@ -186,8 +186,6 @@ if pcall(require, 'usrmerge') then io.flush() end -%endif - %files %dir %{_rpmconfigdir}/lua %{_rpmconfigdir}/lua/usrmerge.lua