Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at 2014-07-31 21:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at (Old) and /work/SRC/openSUSE:Factory/.at.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at" Changes: -------- --- /work/SRC/openSUSE:Factory/at/at.changes 2014-07-29 16:47:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at.new/at.changes 2014-07-31 21:50:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 09:26:21 UTC 2014 - alarrosa@suse.com + +- Remove a relative path that is not needed in the service symlink + +------------------------------------------------------------------- @@ -6 +11,7 @@ - previous change. + sysvinit change. + +------------------------------------------------------------------- +Fri Jul 25 09:20:31 UTC 2014 - pgajdos@suse.com + +- introduced -o <timeformat> switch for atq [bnc#879402] + * added at-atq-timeformat.patch New: ---- at-atq-timeformat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.uq2ceE/_old 2014-07-31 21:50:23.000000000 +0200 +++ /var/tmp/diff_new_pack.uq2ceE/_new 2014-07-31 21:50:23.000000000 +0200 @@ -58,6 +58,8 @@ Patch23: at-secure_getenv.patch #PATCH-FIX-OPENSUSE backport privs from 3.1.8 (bnc#849720) Patch24: at-backport-old-privs.patch +#PATCH-FEATURE-UPSTREAM introduce -o <timeformat> argument for atq (bnc#879402) +Patch25: at-atq-timeformat.patch BuildRequires: autoconf >= 2.69 BuildRequires: automake @@ -102,6 +104,7 @@ %patch22 %patch23 -p1 %patch24 -p1 +%patch25 %build rm -fv y.tab.c y.tab.h lex.yy.c lex.yy.o y.tab.o @@ -133,7 +136,7 @@ %{__install} -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service %{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh -%{__ln_s} -f ../../%{_sbindir}/service %{buildroot}%{_sbindir}/rcatd +%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcatd %{__install} -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/atd %{__install} -m644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates ++++++ at-atq-timeformat.patch ++++++ Index: at.c =================================================================== --- at.c.orig 2014-07-25 10:59:06.264608764 +0200 +++ at.c 2014-07-25 11:00:04.036607665 +0200 @@ -132,9 +132,10 @@ char *namep; char atfile[] = ATJOB_DIR "/12345678901234"; -char *atinput = (char *) 0; /* where to get input from */ -char atqueue = 0; /* which queue to examine for jobs (atq) */ -char atverify = 0; /* verify time instead of queuing job */ +char *atinput = (char *) 0; /* where to get input from */ +char atqueue = 0; /* which queue to examine for jobs (atq) */ +char atverify = 0; /* verify time instead of queuing job */ +char *timeformat = TIMEFORMAT_POSIX; /* time format (atq) */ /* Function declarations */ @@ -494,7 +495,7 @@ runtime = localtime(&runtimer); - strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime); + strftime(timestr, TIMESIZE, timeformat, runtime); fprintf(stderr, "job %ld at %s\n", jobno, timestr); /* Signal atd, if present. Usual precautions taken... */ @@ -608,7 +609,7 @@ runtimer = 60 * (time_t) ctm; runtime = localtime(&runtimer); - strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime); + strftime(timestr, TIMESIZE, timeformat, runtime); if ((pwd = getpwuid(buf.st_uid))) printf("%ld\t%s %c %s\n", jobno, timestr, queue, pwd->pw_name); @@ -805,7 +806,7 @@ */ if (strcmp(pgm, "atq") == 0) { program = ATQ; - options = "hq:V"; + options = "hq:Vo:"; } else if (strcmp(pgm, "atrm") == 0) { program = ATRM; options = "hV"; @@ -889,6 +890,10 @@ timer -= timer % 60; break; + case 'o': + timeformat = optarg; + break; + default: usage(); break; Index: at.1.in =================================================================== --- at.1.in.orig 2014-07-25 10:59:06.204608765 +0200 +++ at.1.in 2014-07-25 11:17:27.828587820 +0200 @@ -29,6 +29,8 @@ .RB [ -V ] .RB [ -q .IR queue ] +.RB [ -o +.IR timeformat ] .br .B at .RB [ -rd ] @@ -254,6 +256,9 @@ .B \-c cats the jobs listed on the command line to standard output. +.TP 8 +.BI \-o " fmt" +strftime-like time format used for the job list .SH FILES .I @ATJBD@ .br Index: panic.c =================================================================== --- panic.c.orig 2014-07-25 10:59:06.168608765 +0200 +++ panic.c 2014-07-25 11:06:20.232600513 +0200 @@ -96,7 +96,7 @@ " at [-V] [-q x] [-f file] [-mMlbv] -t time\n" " at -c job ...\n" " at [-V] -l [job ...]\n" - " atq [-V] [-q x]\n" + " atq [-V] [-q x] [-o timeformat]\n" " at [ -rd ] job ...\n" " atrm [-V] job ...\n" " batch\n"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org