Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2020-08-27 14:42:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man (Old) and /work/SRC/openSUSE:Factory/.man.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man" Thu Aug 27 14:42:01 2020 rev:82 rq:829918 version:2.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/man/man.changes 2020-06-22 17:41:49.901062697 +0200 +++ /work/SRC/openSUSE:Factory/.man.new.3399/man.changes 2020-08-27 14:42:02.645229192 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 07:38:06 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Set libexecdir at build time for wrapper (boo#1175813) +- Do the same in mandb.service + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.AeXxgd/_old 2020-08-27 14:42:03.621228286 +0200 +++ /var/tmp/diff_new_pack.AeXxgd/_new 2020-08-27 14:42:03.625228282 +0200 @@ -185,7 +185,7 @@ done patch --backup --suffix=.s10 ${FUZZ+"--fuzz=$FUZZ"} -p0 < %{SOURCE10} gcc $CFLAGS -I gl/lib/ -I include/ --include config.h -D LOCALEDIR="\"%{_datarootdir}/locale\"" \ - -o wrapper %{SOURCE5} -L gl/lib/.libs/ -lgnu + -D LIBEXECDIR="\"%{_libexecdir}\"" -o wrapper %{SOURCE5} -L gl/lib/.libs/ -lgnu %check if ! make check; then @@ -263,6 +263,7 @@ %if 0%{?suse_version} >= 1500 install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/ + sed -ri 's|@@LIBEXECDIR@@|%{_libexecdir}|' %{buildroot}%{_unitdir}/mandb.service %endif %endif ++++++ mandb.service ++++++ --- /var/tmp/diff_new_pack.AeXxgd/_old 2020-08-27 14:42:03.745228171 +0200 +++ /var/tmp/diff_new_pack.AeXxgd/_new 2020-08-27 14:42:03.749228167 +0200 @@ -9,4 +9,4 @@ Type=oneshot Nice=5 IOSchedulingClass=idle -ExecStart=/usr/lib/man-db/do_mandb +ExecStart=@@LIBEXECDIR@@/man-db/do_mandb ++++++ wrapper.c ++++++ --- /var/tmp/diff_new_pack.AeXxgd/_old 2020-08-27 14:42:03.781228137 +0200 +++ /var/tmp/diff_new_pack.AeXxgd/_new 2020-08-27 14:42:03.781228137 +0200 @@ -44,6 +44,9 @@ #include "manconfig.h" +#ifndef LIBEXECDIR +# define LIBEXECDIR "/usr/lib" +#endif /* this list is used to authenticate the program running. * it is fixed at compile time to avoid a full class of @@ -59,8 +62,8 @@ { "_man", "src/man", "man" }, { "_mandb", "src/mandb", "man" }, #endif - { "man", "/usr/lib/man-db/man", "man" }, - { "mandb", "/usr/lib/man-db/mandb", "man" }, + { "man", LIBEXECDIR "/man-db/man", "man" }, + { "mandb", LIBEXECDIR "/man-db/mandb", "man" }, { 0, 0, 0, }}; char *program_name;
