diff --git a/tcsh-skip-utmp-service.dif b/tcsh-skip-utmp-service.dif new file mode 100644 index 0000000..2be1114 --- /dev/null +++ b/tcsh-skip-utmp-service.dif @@ -0,0 +1,33 @@ +--- + tests/commands.at | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- tests/commands.at ++++ tests/commands.at 2023-12-04 12:21:56.688878232 +0000 +@@ -980,16 +980,16 @@ dnl + dnl log + dnl + +-AT_SETUP([log]) +-AT_KEYWORDS([commands]) +- +-AT_DATA([log.csh], +-[[set watch=(this_user_does_not_exist) +-log +-]]) +-AT_CHECK([tcsh -f log.csh]) +- +-AT_CLEANUP() ++dnl AT_SETUP([log]) ++dnl AT_KEYWORDS([commands]) ++dnl ++dnl AT_DATA([log.csh], ++dnl [[set watch=(this_user_does_not_exist) ++dnl log ++dnl ]]) ++dnl AT_CHECK([tcsh -f log.csh]) ++dnl ++dnl AT_CLEANUP() + + + dnl diff --git a/tcsh.changes b/tcsh.changes index fc53176..68bbae8 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 4 12:19:00 UTC 2023 - Dr. Werner Fink + +- Add patch tcsh-skip-utmp-service.dif + * There is currently no API avaible to replace the utmp/wtmp + based builtins watch and who of tcsh + ------------------------------------------------------------------- Thu Oct 12 11:10:59 UTC 2023 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index 346ff60..67b5468 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -35,6 +35,7 @@ Patch3: tcsh-6.24.10-history-merge.dif Patch4: tcsh-6.18.03-colorls.dif Patch5: tcsh-6.17.06-dspmbyte.dif Patch6: tcsh-6.18.03-catalogs.dif +Patch7: tcsh-skip-utmp-service.dif Patch8: tcsh-6.22.02-local-dotlock.dif BuildRequires: autoconf BuildRequires: fdupes @@ -56,14 +57,17 @@ correction, a history mechanism, job control, and a C-like syntax. %prep %setup -q -%patch1 -b .pipe -%patch2 -b .normcmd -%patch3 -b .merge -%patch4 -b .colorls -%patch5 -b .dspmbyte -%patch6 -b .catalogs -%patch8 -p 0 -b .dotlock -%patch0 -b .0 +%patch -P1 -b .pipe +%patch -P2 -b .normcmd +%patch -P3 -b .merge +%patch -P4 -b .colorls +%patch -P5 -b .dspmbyte +%patch -P6 -b .catalogs +%if 0%{?suse_version} >= 1699 +%patch -P7 -b .noutmp +%endif +%patch -P8 -p 0 -b .dotlock +%patch -P0 -b .0 %build @@ -95,10 +99,18 @@ correction, a history mechanism, job control, and a C-like syntax. } CC=gcc CFLAGS="%{optflags} -D_GNU_SOURCE -DBUFSIZE=8192 -pipe" +%if 0%{?suse_version} >= 1699 + # + # There is currently no API for using systemd logind + # for watch and who tcsh builtin. + # + CFLAGS="${CFLAGS} -DHAVENOUTMP" +%endif cflags -ftree-loop-linear CFLAGS cflags -Wl,-O2 LDFLAGS cflags -Wl,--as-needed LDFLAGS export CC CFLAGS LDFLAGS + %ifarch %ix86 CPU=i586 %else