From a10fa31c0dd6fee1ed4003e48bae29c56af10db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Fri, 23 Apr 2021 16:06:19 +0200 Subject: [PATCH] Modernize spec file Use autosetup/autopatch and get rid of explicit patch numbering Related: rhbz#1938678 --- at.spec | 80 ++++++++++++++++++++++----------------------------------- 1 file changed, 31 insertions(+), 49 deletions(-) diff --git a/at.spec b/at.spec index a8be9ad..d6ac00d 100644 --- a/at.spec +++ b/at.spec @@ -15,23 +15,23 @@ Source1: pam_atd Source3: atd.sysconf Source5: 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 -Patch5: at-3.1.20-shell.patch -Patch6: at-3.1.18-nitpicks.patch -Patch8: at-3.1.14-fix_no_export.patch -Patch9: at-3.1.14-mailwithhostname.patch -Patch10: at-3.1.14-usePOSIXtimers.patch -Patch12: at-3.1.20-aborted-jobs.patch -Patch13: at-3.1.18-noabort.patch -Patch14: at-3.1.16-fclose-error.patch -Patch15: at-3.1.16-clear-nonjobs.patch -Patch16: at-3.1.18-utc-dst.patch -Patch17: at-3.1.20-lock-locks.patch -Patch18: at-3.1.23-document-n.patch -Patch19: at-3.1.20-log-jobs.patch +Patch: at-aarch64.patch +Patch: at-3.1.18-make.patch +Patch: at-3.1.20-pam.patch +Patch: at-3.1.14-opt_V.patch +Patch: at-3.1.20-shell.patch +Patch: at-3.1.18-nitpicks.patch +Patch: at-3.1.14-fix_no_export.patch +Patch: at-3.1.14-mailwithhostname.patch +Patch: at-3.1.14-usePOSIXtimers.patch +Patch: at-3.1.20-aborted-jobs.patch +Patch: at-3.1.18-noabort.patch +Patch: at-3.1.16-fclose-error.patch +Patch: at-3.1.16-clear-nonjobs.patch +Patch: at-3.1.18-utc-dst.patch +Patch: at-3.1.20-lock-locks.patch +Patch: at-3.1.23-document-n.patch +Patch: at-3.1.20-log-jobs.patch BuildRequires: gcc BuildRequires: flex flex-static bison autoconf @@ -66,28 +66,12 @@ need to be repeated at the same time every day/week, etc. you should use crontab instead. %prep -%setup -q +%autosetup -N cp %{SOURCE1} . -%patch0 -p1 -b .arm -%patch1 -p1 -b .make -%patch2 -p1 -b .pam -%patch4 -p1 -b .opt_V -%patch5 -p1 -b .shell -%patch6 -p1 -b .nit -%patch8 -p1 -b .export -%patch9 -p1 -b .mail -%patch10 -p1 -b .posix -%patch12 -p1 -b .aborted -%patch13 -p1 -b .noabort -%patch14 -p1 -b .fclose -%patch15 -p1 -b .clear-nojobs -%patch16 -p1 -b .dst -%patch17 -p1 -b .lock-locks -%patch18 -p1 -b .document-n -%patch19 -p1 -b .log-jobs +%autopatch -p1 %build -# patch9 touches configure.in +# at-3.1.14-usePOSIXtimers.patch touches configure.in autoconf # uselles files rm -f lex.yy.* y.tab.* @@ -96,9 +80,7 @@ rm -f lex.yy.* y.tab.* --with-daemon_username=root \ --with-daemon_groupname=root \ --with-selinux \ -%if %{with pam} - --with-pam -%endif + %{?with_pam:--with-pam} make @@ -324,7 +306,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Mon Nov 14 2011 Marcela Mašláňová - 3.1.13-5 -- 754156 fix typo in script +- 754156 fix typo in script * Mon Nov 14 2011 Marcela Mašláňová - 3.1.13-5 - fix incorrect option in test in 56atd @@ -366,7 +348,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - 617320 systemd init script replacement * Mon Mar 15 2010 Marcela Mašláňová - 3.1.12-5 -- 568222 interrupted 'at' job creates empty job for non-root +- 568222 interrupted 'at' job creates empty job for non-root * Mon Mar 1 2010 Marcela Mašláňová - 3.1.12-4 - 568779 atd is alway runnig after suspend/resume @@ -423,7 +405,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - 486227 add hyphen date into manual page. * Wed Dec 3 2008 Marcela Mašláňová - 3.1.10-27 -- 464393 add script into pm-utils, because daemon wasn't taking all jobs +- 464393 add script into pm-utils, because daemon wasn't taking all jobs after suspend/hibernate * Fri Oct 24 2008 Marcela Mašláňová - 3.1.10-26 @@ -501,7 +483,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - rhbz#224597 * Fri Oct 27 2006 Marcela Maslanova - 3.1.10-6 -- fix daylight-saving again +- fix daylight-saving again - fix #214759 - problem with seteuid * Wed Oct 25 2006 Marcela Maslanova - 3.1.10-5 @@ -536,11 +518,11 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - use include instead of pam_stack in pam config * Fri Jun 03 2005 Jason Vas Dias 3.1.8-78 -- fix bug 159220: add pam_loginuid to pam session stack in /etc/pam.d/atd +- fix bug 159220: add pam_loginuid to pam session stack in /etc/pam.d/atd - fix bug 102341: add '-r' synonym for '-d' / atrm for POSIX / SuS conformance * Fri Apr 08 2005 Jason Vas Dias 3.1.8-77 -- always call pam_setcred(pamh, PAM_DELETE_CRED) before session +- always call pam_setcred(pamh, PAM_DELETE_CRED) before session - close * Tue Apr 05 2005 Jason Vas Dias 3.1.8-70 @@ -551,7 +533,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - user can know when using at(1) if PAM permission is denied. * Tue Mar 08 2005 Jason Vas Dias 3.1.8-67 -- better fix for bug 150131: change DAEMON_USERNAME and +- better fix for bug 150131: change DAEMON_USERNAME and - DAEMON_GROUPNAME to 'root' . * Mon Mar 07 2005 Jason Vas Dias 3.1.8-66 @@ -569,7 +551,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - details of blacklisted variables. * Tue Sep 28 2004 Rik van Riel 3.1.8-58 -- fix typo in man page, bug 112303 +- fix typo in man page, bug 112303 - (regenerated at-3.1.8-man-timespec-path.patch with fix) * Tue Aug 03 2004 Jason Vas Dias @@ -702,7 +684,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ - updated patch update, still bug #46546 * Wed Jul 18 2001 Crutcher Dunnavant -- applied enrico.scholz@informatik.tu-chemnitz.de's change to the env patch to +- applied enrico.scholz@informatik.tu-chemnitz.de's change to the env patch to - address bug #46546 * Mon Jun 25 2001 Crutcher Dunnavant @@ -785,7 +767,7 @@ chown root:root %{_localstatedir}/spool/at/.SEQ * Mon May 24 1999 Jeff Johnson - reset SIGCHLD before exec (#3016). -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 8) * Thu Mar 18 1999 Cristian Gafton