diff --git a/acct-6.6.2-hz.patch b/acct-6.6.2-hz.patch index 579fdd6..0f6de3e 100644 --- a/acct-6.6.2-hz.patch +++ b/acct-6.6.2-hz.patch @@ -5,11 +5,11 @@ Subject: acct-hz.patch sa.c | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) -Index: acct-6.6.1/lastcomm.c +Index: lastcomm.c =================================================================== ---- acct-6.6.1.orig/lastcomm.c 2011-03-16 23:50:13.000000000 +0100 -+++ acct-6.6.1/lastcomm.c 2013-12-21 23:54:26.496776873 +0100 -@@ -71,7 +75,7 @@ int debugging_enabled = 0; /* Nonzero me +--- lastcomm.c.orig ++++ lastcomm.c +@@ -71,7 +71,7 @@ int debugging_enabled = 0; /* Nonzero me int strict_match_flag = 0; /* Nonzero if each record has to match all items on the command line */ int print_controls = 0; /* don't print control characters */ @@ -18,7 +18,7 @@ Index: acct-6.6.1/lastcomm.c char *program_name; /* name of the program, for usage & errs */ -@@ -328,6 +332,14 @@ void parse_entries(void) +@@ -328,6 +328,14 @@ void parse_entries(void) print_pacct_record (rec, stddebug); } @@ -33,11 +33,11 @@ Index: acct-6.6.1/lastcomm.c if (desired_entry (this_uid, this_dev, rec->ac_comm)) { double ut = ACUTIME_2_DOUBLE (rec->ac_utime); -Index: acct-6.6.1/sa.c +Index: sa.c =================================================================== ---- acct-6.6.1.orig/sa.c 2011-03-16 23:50:13.000000000 +0100 -+++ acct-6.6.1/sa.c 2013-12-21 23:54:26.497776877 +0100 -@@ -190,7 +190,7 @@ +--- sa.c.orig ++++ sa.c +@@ -191,7 +191,7 @@ int print_users = 0; int percentages = 0; /* include percentages in printout */ int user_summary_flag = 0; /* are we printing a user summary? */ int group_summary_flag = 0; /* are we printing a group summary? */ @@ -46,7 +46,7 @@ Index: acct-6.6.1/sa.c #if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME) -@@ -1172,6 +1172,18 @@ void parse_acct_entries (void) +@@ -1180,6 +1180,18 @@ void parse_acct_entries (void) /* loop while there are entries to be had */ while ((rec = pacct_get_entry ()) != NULL) { diff --git a/acct-6.6.2.tar.gz b/acct-6.6.2.tar.gz deleted file mode 100644 index eaed23a..0000000 --- a/acct-6.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101 -size 852375 diff --git a/acct-6.6.2.tar.gz.sig b/acct-6.6.2.tar.gz.sig deleted file mode 100644 index afc6902..0000000 --- a/acct-6.6.2.tar.gz.sig +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) -Comment: GPGTools - http://gpgtools.org - -iD8DBQBUXah66I0XmJx2NrwRArrGAJ9dPOcXCDInhWE1NKuQGq18k0HsKgCg0mZT -xTfFjV9lPDwMJEr8NUeyLfE= -=qM8Q ------END PGP SIGNATURE----- diff --git a/acct-6.6.3.tar.gz b/acct-6.6.3.tar.gz new file mode 100644 index 0000000..b135599 --- /dev/null +++ b/acct-6.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eae79323bf1ce403704d2b70483c46e7c853276ee7b5ad561ec3ccae9fca093 +size 853083 diff --git a/acct-6.6.3.tar.gz.sig b/acct-6.6.3.tar.gz.sig new file mode 100644 index 0000000..c60e305 --- /dev/null +++ b/acct-6.6.3.tar.gz.sig @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 +Comment: GPGTools - http://gpgtools.org + +iD8DBQBY5V7s6I0XmJx2NrwRApN/AJsFgRomzBjkSnIlCjzjDhuSXL+STwCeJ7eh +2BefLXiQAAexVbGnxPpY81g= +=EeNq +-----END PGP SIGNATURE----- diff --git a/acct-ac.patch b/acct-ac.patch deleted file mode 100644 index a232a61..0000000 --- a/acct-ac.patch +++ /dev/null @@ -1,39 +0,0 @@ -Subject: configure.ac: Change AC_LANG_SOURCE() into AC_LANG_PROGRAM() - ---- - configure.ac | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -Index: acct-6.6.1/configure.ac -=================================================================== ---- acct-6.6.1.orig/configure.ac 2013-03-09 00:19:37.000000000 +0100 -+++ acct-6.6.1/configure.ac 2013-12-21 23:54:54.896897230 +0100 -@@ -231,7 +231,7 @@ AC_CHECK_HEADER(sys/acct.h, - dnl - dnl find out where utmp/pacct are stored - dnl --AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+AC_RUN_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - #include -@@ -310,9 +310,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - # endif - # endif - #endif -- --main () --{ -+]], [[ - FILE *fp; - fp = fopen ("locs", "w"); - fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE); -@@ -320,8 +318,6 @@ main () - fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE); - fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE); - fclose (fp); -- exit(0); --} - ]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ]) - - dnl types diff --git a/acct-info.patch b/acct-info.patch index 1ba50d6..07bad7e 100644 --- a/acct-info.patch +++ b/acct-info.patch @@ -4,13 +4,13 @@ Subject: Add @dircategory and @direntry accounting.texi | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -diff --git a/accounting.texi b/accounting.texi -index f580f6f..5c8df0d 100644 ---- a/accounting.texi -+++ b/accounting.texi -@@ -11,6 +11,11 @@ - - @include version.texi +Index: accounting.texi +=================================================================== +--- accounting.texi.orig ++++ accounting.texi +@@ -16,6 +16,11 @@ + * acct: (accounting). User specific process accounting. + @end direntry +@dircategory Miscellaneous +@direntry @@ -20,6 +20,3 @@ index f580f6f..5c8df0d 100644 @ifinfo GNU Accounting Utilities Copyright (C) 1993, 1996, 1997, 1998, 2005, 2008, 2009, 2010 --- -1.7.7 - diff --git a/acct-timestamp.patch b/acct-timestamp.patch deleted file mode 100644 index b0ef1c4..0000000 --- a/acct-timestamp.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - accounting.texi | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -Index: acct-6.6.2/accounting.texi -=================================================================== ---- acct-6.6.2.orig/accounting.texi -+++ acct-6.6.2/accounting.texi -@@ -79,9 +79,7 @@ the accounting utilities, read the intro - information about any of the applications, see the chapter with the - program's name. - --This is Edition @value{EDITION} of the documentation, updated --@value{UPDATED} for version @value{VERSION} of the GNU Accounting --Utilities. -+This is version @value{VERSION} of the GNU Accounting Utilities. - @end ifnottex - - @menu diff --git a/acct.changes b/acct.changes index 753d3dc..0ece188 100644 --- a/acct.changes +++ b/acct.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Apr 6 11:59:18 UTC 2017 - mpluskal@suse.com + +- Update to version 6.6.3: + * Fixed manuals. +- Refresh patches: + * acct-6.6.2-hz.patch + * acct-info.patch +- Drop no longer needed: + * acct-ac.patch + * acct-timestamp.patch + +------------------------------------------------------------------- +Wed Mar 29 11:22:15 UTC 2017 - kstreitova@suse.com + +- cleanup with spec-cleaner +- get rid of %{name} and %{version} macros from the patch names + ------------------------------------------------------------------- Wed Jul 13 19:46:53 UTC 2016 - kstreitova@suse.com diff --git a/acct.spec b/acct.spec index 0e70e61..3512d11 100644 --- a/acct.spec +++ b/acct.spec @@ -1,7 +1,7 @@ # # spec file for package acct # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,19 @@ Name: acct -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: User-Specific Process Accounting License: GPL-2.0+ Group: System/Base -Url: http://www.gnu.org/software/acct/ -Source: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz +Url: https://www.gnu.org/software/acct/ +Source: https://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz Source1: acct.service Source2: logrotate.acct -Source3: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig -Source4: %{name}.keyring -Patch0: %{name}-%{version}-hz.patch -Patch2: %{name}-info.patch -Patch3: %{name}-ac.patch -Patch4: acct-timestamp.patch -BuildRequires: libtool +Source3: https://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig +Source4: acct.keyring +Patch0: acct-6.6.2-hz.patch +Patch2: acct-info.patch BuildRequires: makeinfo BuildRequires: systemd-rpm-macros Requires: logrotate @@ -47,13 +44,10 @@ accounting: sa, accton, and lastcomm. %prep %setup -q -%patch0 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch0 +%patch2 %build -autoreconf -ivf %configure make %{?_smp_mflags} @@ -93,7 +87,7 @@ rm -f %{buildroot}/%{_mandir}/man1/last.1* %files %defattr(-, root, root) %doc README NEWS -%{_infodir}/*.info.* +%{_infodir}/*.info%{ext_info} %{_mandir}/man1/ac* %{_mandir}/man1/lastcomm* %{_mandir}/man8/*