!1 Fix error in at command

Merge pull request !1 from chengquan/developer

at.spec

@@ -1,6 +1,6 @@
 Name:             at
 Version:          3.1.23
-Release:          3
+Release:          4
 Summary:          A job manager
 License:          GPLv3+, GPLv2+, ISC, MIT, Public Domain
 URL:              http://ftp.debian.org/debian/pool/main/a/at
@@ -12,26 +12,26 @@ Source3:          atd.systemd
 Patch0:           at-aarch64.patch
 Patch1:           at-3.1.18-make.patch
 Patch2:           at-3.1.20-pam.patch
-Patch4:           at-3.1.14-opt_V.patch
+Patch3:           at-3.1.14-opt_V.patch
-Patch5:           at-3.1.20-shell.patch
+Patch4:           at-3.1.20-shell.patch
-Patch6:           at-3.1.18-nitpicks.patch
+Patch5:           at-3.1.18-nitpicks.patch
-Patch8:           at-3.1.14-fix_no_export.patch
+Patch6:           at-3.1.14-fix_no_export.patch
-Patch9:           at-3.1.14-mailwithhostname.patch
+Patch7:           at-3.1.14-mailwithhostname.patch
-Patch10:          at-3.1.14-usePOSIXtimers.patch
+Patch8:           at-3.1.14-usePOSIXtimers.patch
-Patch12:          at-3.1.20-aborted-jobs.patch
+Patch9:           at-3.1.20-aborted-jobs.patch
-Patch13:          at-3.1.18-noabort.patch
+Patch10:          at-3.1.18-noabort.patch
-Patch14:          at-3.1.16-fclose-error.patch
+Patch11:          at-3.1.16-fclose-error.patch
-Patch15:          at-3.1.16-clear-nonjobs.patch
+Patch12:          at-3.1.16-clear-nonjobs.patch
-Patch16:          at-3.1.18-utc-dst.patch
+Patch13:          at-3.1.18-utc-dst.patch
-Patch17:          at-3.1.20-lock-locks.patch
+Patch14:          at-3.1.20-lock-locks.patch
-Patch18:          at-3.1.23-document-n.patch
+Patch15:          at-3.1.23-document-n.patch
-Patch19:          at-3.1.20-log-jobs.patch
+Patch16:          at-3.1.20-log-jobs.patch
 
-BuildRequires:    gcc flex flex-static bison pam-devel smtpdaemon
+BuildRequires:    gcc flex flex-static bison pam-devel smtpdaemon pam-devel
 BuildRequires:    autoconf libselinux-devel >= 1.27.9 perl(Test::Harness) perl(Test::More)
-Requires(post):   systemd
+%{?systemd_requires}
-Requires(preun):  systemd
+
-Requires(postun): systemd
+Conflicts:        crontabs <= 1.5
 
 %description
 AT and batch delay command scheduling utility and daemon.
@@ -39,32 +39,53 @@ AT and batch delay command scheduling utility and daemon.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%setup -q
+cp %{SOURCE1} .
+%{lua:for i=0,16 do print(string.format("%%patch%u -p1\n", i)) end}
 
 %build
 autoconf
+rm -f lex.yy.* y.tab.*
 %configure --with-atspool=%{_localstatedir}/spool/at/spool \
 	--with-jobdir=%{_localstatedir}/spool/at \
-           --with-pam  --with-selinux \
 	--with-daemon_username=root  \
 	--with-daemon_groupname=root \
-make
+	--with-selinux \
+	--with-pam
+
+%make_build
 
 %install
-cp %{SOURCE1} .
+make install \
-%make_install \
 	DAEMON_USERNAME=`id -nu`\
 	DAEMON_GROUPNAME=`id -ng` \
-      IROOT=%{buildroot} \
+	DESTDIR=$RPM_BUILD_ROOT\
-      INSTALL_ROOT_USER=`id -nu`
+	sbindir=$RPM_BUILD_ROOT%{_prefix}/sbin\
+	bindir=$RPM_BUILD_ROOT%{_bindir}\
+	prefix=$RPM_BUILD_ROOT%{_prefix}\
+	exec_prefix=$RPM_BUILD_ROOT%{_prefix}\
+	docdir=$RPM_BUILD_ROOT/usr/doc\
+	mandir=$RPM_BUILD_ROOT%{_mandir}\
+	etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \
+	ATJOB_DIR=$RPM_BUILD_ROOT%{_localstatedir}/spool/at \
+	ATSPOOL_DIR=$RPM_BUILD_ROOT%{_localstatedir}/spool/at/spool \
+	INSTALL_ROOT_USER=`id -nu` \
+	INSTALL_ROOT_GROUP=`id -nu`;
 
-mkdir -p %{buildroot}/etc/sysconfig
+echo > $RPM_BUILD_ROOT%{_sysconfdir}/at.deny
-install -m 644 %{SOURCE2} %{buildroot}/etc/sysconfig/atd
+mkdir docs
+cp $RPM_BUILD_ROOT/%{_prefix}/doc/at/* docs/
 
-mkdir -p %{buildroot}/%{_unitdir}/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/atd.service
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/atd
 
-rm -rf %{buildroot}%{_prefix}/doc
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/atd
+
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/atd.service
+
+rm -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %check
 make test
@@ -84,26 +105,32 @@ chown root:root %{_localstatedir}/spool/at/.SEQ
 %systemd_postun_with_restart atd.service
 
 %files
-%doc ChangeLog README timespec
+%license Copyright COPYING
-%license COPYING Copyright
+%doc README timespec ChangeLog
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/at.deny
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/sysconfig/atd
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/pam.d/atd
-%attr(0700,root,root) %dir %{_localstatedir}/spool/at
-%attr(0700,root,root) %dir %{_localstatedir}/spool/at/spool
-%attr(0600,root,root) %ghost %verify(not md5 size mtime) %{_localstatedir}/spool/at/.SEQ
-%attr(0644,root,root) %{_unitdir}/atd.service
 %attr(4755,root,root)		%{_bindir}/at
-%{_bindir}/atq
-%{_bindir}/atrm
-%{_bindir}/batch
 %attr(0755,root,root)		%{_sbindir}/atd
+%{_bindir}/atrm
+%{_bindir}/atq
+%{_bindir}/batch
 %{_sbindir}/atrun
+%attr(0700,root,root)		%dir %{_localstatedir}/spool/at
+%attr(0600,root,root)		%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
+%attr(0700,root,root)		%dir %{_localstatedir}/spool/at/spool
+%attr(0644,root,root)		/%{_unitdir}/atd.service
 
 %files help
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jan 16 2020 chengquan<chengquan3@huawei.com> - 3.1.23-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix error in at command
+
 * Sun Sep 29 2019 chengquan<chengquan3@huawei.com> - 3.1.23-3
 - Type:bugfix
 - ID:NA