packages: psacct/psacct-path.patch, psacct/psacct.spec - 6.5.5 from gnu.org...

[baggins]

Author: baggins                      Date: Fri Jan 28 22:36:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 6.5.5 from gnu.org
- removed obsolete patches

---- Files affected:
packages/psacct:
   psacct-path.patch (1.1 -> 1.2) , psacct.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: packages/psacct/psacct-path.patch
diff -u packages/psacct/psacct-path.patch:1.1 packages/psacct/psacct-path.patch:1.2
--- packages/psacct/psacct-path.patch:1.1	Sun Jul 21 20:50:14 2002
+++ packages/psacct/psacct-path.patch	Fri Jan 28 23:36:02 2011
@@ -1,29 +1,27 @@
-Only in acct-6.3.2.acme: .Makefile.in.swp
-diff -ur acct-6.3.2/configure.in acct-6.3.2.acme/configure.in
---- acct-6.3.2/configure.in	Tue Mar 10 15:09:45 1998
-+++ acct-6.3.2.acme/configure.in	Mon Oct 26 18:22:11 1998
+--- acct-6.5.5/configure.ac	Tue Mar 10 15:09:45 1998
++++ acct-6.5.5.acme/configure.ac	Mon Oct 26 18:22:11 1998
 @@ -167,7 +167,7 @@
- 
  #ifndef ACCT_FILE
  #  if defined(__FreeBSD__) || defined(__linux__)
+         || defined(__FreeBSD_kernel__)
 -#    define ACCT_FILE "/var/account/pacct"
 +#    define ACCT_FILE "/var/log/pacct"
  #  else
  #    if defined(__NetBSD__)
  #      define ACCT_FILE "/var/account/acct"
 @@ -187,7 +187,7 @@
- 
  #ifndef SAVACCT_FILE
  #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+         || defined(__FreeBSD_kernel__)
 -#    define SAVACCT_FILE "/var/account/savacct"
 +#    define SAVACCT_FILE "/var/log/savacct"
  #  else
  #    if defined(sun) || defined(AMIX)
  #      define SAVACCT_FILE "/var/adm/savacct"
 @@ -203,7 +203,7 @@
- 
  #ifndef USRACCT_FILE
  #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+         || defined(__FreeBSD_kernel__)
 -#    define USRACCT_FILE "/var/account/usracct"
 +#    define USRACCT_FILE "/var/log/usracct"
  #  else

================================================================
Index: packages/psacct/psacct.spec
diff -u packages/psacct/psacct.spec:1.63 packages/psacct/psacct.spec:1.64
--- packages/psacct/psacct.spec:1.63	Thu Jan 24 02:23:02 2008
+++ packages/psacct/psacct.spec	Fri Jan 28 23:36:02 2011
@@ -6,23 +6,18 @@
 Summary(uk.UTF-8):	Утиліти для моніторингу активності процесів
 Summary(ru.UTF-8):	Утилиты для мониторинга активности процессов
 Name:		psacct
-Version:	6.3.5
-Release:	11
+Version:	6.5.5
+Release:	1
 License:	GPL
 Group:		Applications/System
 # there is only 6.3.2 on ftp://ftp.gnu.org/pub/gnu/acct/
-# GNU page points to Debian resources, but they have modified ".orig" package
-# and we have something else in CVS, which probably matches this:
-Source0:	ftp://ftp.pl.openwall.com/pub/Owl/pool/sources/acct/acct-%{version}.tar.gz
-# Source0-md5:	a982333648d68e0eabf87989a1e5427b
+Source0:	http://ftp.gnu.org/gnu/acct/acct-%{version}.tar.gz
+# Source0-md5:	554a9e9c6aa3482df07e80853eac0350
 Source1:	acct.logrotate
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	85eb213fc45fad1c7834d239ff8e28a4
 Source3:	acct.sysinit
 Source4:	acct.sysconfig
-Patch0:		acct-info.patch
-Patch1:		acct-amfix.patch
-Patch2:		%{name}-ac_am.patch
 Patch3:		%{name}-path.patch
 URL:		http://www.gnu.org/directory/GNU/acct.html
 BuildRequires:	autoconf
@@ -56,17 +51,16 @@
 
 %prep
 %setup -q -n acct-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %{__autoheader}
-%configure
+
+%configure \
+	--enable-linux-multiformat
 
 %{__make}
 
@@ -140,6 +134,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2011/01/28 22:36:02  baggins
+- 6.5.5 from gnu.org
+- removed obsolete patches
+
 Revision 1.63  2008/01/24 01:23:02  glen
 - invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psacct/psacct-path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psacct/psacct.spec?r1=1.63&r2=1.64&f=u