testing/compat-usrmerge
SHA256
3
0
Fork 0
forked from pool/compat-usrmerge
Code Pull Requests Activity

Accepting request 914526 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/914526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/compat-usrmerge?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2021-09-11 20:24:08 +00:00 committed by Git OBS Bridge
commit 46df6602c0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compat-usrmerge.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 27 06:35:26 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- 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 <lnussel@suse.de> Tue Jun 15 15:27:41 UTC 2021 - Ludwig Nussel <lnussel@suse.de>

14
compat-usrmerge.spec
View File

@ -35,6 +35,7 @@ Source5: usrmerge.attr
Source6: usrmerge_binsbindeps.lua Source6: usrmerge_binsbindeps.lua
Source7: usrmergefiles.py Source7: usrmergefiles.py
BuildRequires: gcc BuildRequires: gcc
BuildRequires: glibc-static
BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(rpm)
%description %description
@ -43,6 +44,7 @@ Scripts and data files related to UsrMerge
%package tools %package tools
Summary: UsrMerge tools Summary: UsrMerge tools
Requires: (compat-usrmerge if compat-usrmerge)
# have to turn requires off this off to avoid pulling in stuff # have to turn requires off this off to avoid pulling in stuff
# before filessytem. # before filessytem.
# xmv has very minimal glibc requirements and could probably be # xmv has very minimal glibc requirements and could probably be
@ -68,7 +70,7 @@ binaries in /(s)bin.
%build %build
gcc -Wall %optflags -o usrmergecheck %{SOURCE2} `pkg-config --libs rpm` 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
install -D -m755 usrmergecheck %{buildroot}%{_bindir}/usrmergecheck install -D -m755 usrmergecheck %{buildroot}%{_bindir}/usrmergecheck
@ -144,9 +146,7 @@ end
EOF EOF
%endif %endif
%if 0%{?usrmerge_filetriggers} %filetriggerin -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
%filetriggerin -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
require("usrmerge") require("usrmerge")
if posix.getenv("VERBOSE_FILETRIGGERS") then if posix.getenv("VERBOSE_FILETRIGGERS") then
usrmerge.debug = "%{nvr}(in)" usrmerge.debug = "%{nvr}(in)"
@ -158,7 +158,7 @@ while file do
end end
io.flush() io.flush()
%filetriggerpostun -p <lua> -- %{_sbindir} %{_bindir} %{_libdir} %filetriggerpostun -p <lua> -- %{_sbindir} %{_bindir} %{_libdir}
-- the module is already gone if we get called for ourselves -- the module is already gone if we get called for ourselves
if pcall(require, 'usrmerge') then if pcall(require, 'usrmerge') then
if posix.getenv("VERBOSE_FILETRIGGERS") then if posix.getenv("VERBOSE_FILETRIGGERS") then
@ -172,7 +172,7 @@ if pcall(require, 'usrmerge') then
io.flush() io.flush()
end end
%filetriggerpostun -p <lua> -- /sbin /bin /%{_lib} %filetriggerpostun -p <lua> -- /sbin /bin /%{_lib}
-- the module is already gone if we get called for ourselves -- the module is already gone if we get called for ourselves
if pcall(require, 'usrmerge') then if pcall(require, 'usrmerge') then
if posix.getenv("VERBOSE_FILETRIGGERS") then if posix.getenv("VERBOSE_FILETRIGGERS") then
@ -186,8 +186,6 @@ if pcall(require, 'usrmerge') then
io.flush() io.flush()
end end
%endif
%files %files
%dir %{_rpmconfigdir}/lua %dir %{_rpmconfigdir}/lua
%{_rpmconfigdir}/lua/usrmerge.lua %{_rpmconfigdir}/lua/usrmerge.lua