RPM spec update and time.h cleanups (from RedHat latest rpm)

diff --git a/dump.spec b/dump.spec
index 6603fd7932ce31e239d94f0c5ae93b6d91e772bf..50645acda850f1fe283ab89401dfa8b6fa1335d5 100644 (file)
--- a/dump.spec
+++ b/dump.spec
@@ -2,7 +2,7 @@
 # XXX --enable-kerberos                needs krcmd
 %define        myoptions --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline --enable-largefile --enable-qfa
 
-Summary: Programs for backing up and restoring filesystems.
+Summary: Programs for backing up and restoring ext2/ext3 filesystems.
 Name: dump
 Version: 0.4b22
 Release: 1
@@ -10,7 +10,7 @@ License: BSD
 Group: Applications/Archiving
 Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz
 Requires: rmt
-BuildRequires: e2fsprogs-devel
+BuildPrereq: e2fsprogs-devel, libtermcap-devel, readline-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -58,7 +58,11 @@ This packages contains statically linked versions of dump and restore.
 %build
 %configure %{myoptions} --enable-static
 
-make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
+%ifarch alpha
+RPM_OPT_FLAGS=""
+%endif
+make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \
+                         -Wmissing-prototypes -Wno-char-subscripts"
 
 mv dump/dump dump/dump.static
 mv restore/restore restore/restore.static
@@ -67,7 +71,8 @@ make distclean
 
 %configure %{myoptions} --enable-rmt
 
-make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
+make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \
+                         -Wmissing-prototypes -Wno-char-subscripts"
 
 %install
 rm -rf %{buildroot}

diff --git a/dump/itime.c b/dump/itime.c
index cc92bb5b9e1e2a08ea111e95e8379d39bebcd51e..41eb78a9c20ea8ce956afd05640ac0bfce284d86 100644 (file)
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: itime.c,v 1.19 2001/06/18 10:58:28 stelian Exp $";
+       "$Id: itime.c,v 1.20 2001/07/18 09:12:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -55,6 +55,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/time.h>
+#include <time.h>
 #ifdef __linux__
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
@@ -62,7 +63,6 @@ static const char rcsid[] =
 #include <linux/ext2_fs.h>
 #endif
 #include <ext2fs/ext2fs.h>
-#include <time.h>
 #include <bsdcompat.h>
 #include <sys/file.h>
 #include <unistd.h>

diff --git a/dump/main.c b/dump/main.c
index ae9ffce26135fd350911ae73eb4a350385137e14..15d00f32cefd275f118552e47117a406a5cf7496 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.49 2001/06/18 10:58:28 stelian Exp $";
+       "$Id: main.c,v 1.50 2001/07/18 09:12:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -58,6 +58,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/time.h>
+#include <time.h>
 #ifdef __linux__
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
@@ -65,7 +66,6 @@ static const char rcsid[] =
 #include <linux/ext2_fs.h>
 #endif
 #include <ext2fs/ext2fs.h>
-#include <time.h>
 #include <sys/stat.h>
 #include <bsdcompat.h>
 #elif defined sunos

diff --git a/dump/optr.c b/dump/optr.c
index 88ff63d0c8e708fd55aabdaace79e76add26b259..d1cdf1d711821d06572daae8b76b44afafe4ef61 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -41,13 +41,14 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.24 2001/06/18 11:07:45 stelian Exp $";
+       "$Id: optr.c,v 1.25 2001/07/18 09:12:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include <errno.h>
 #include <fstab.h>

diff --git a/dump/tape.c b/dump/tape.c
index f846221b502578587e38ea5f508735ca24514bc5..25d7c502c4cba16626a3759d05ccea1a87283166 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.47 2001/06/18 10:58:28 stelian Exp $";
+       "$Id: tape.c,v 1.48 2001/07/18 09:12:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -62,6 +62,7 @@ int    write(), read();
 
 #ifdef __linux__
 #include <sys/types.h>
+#include <sys/time.h>
 #include <time.h>
 #endif
 #include <sys/param.h>

diff --git a/dump/unctime.c b/dump/unctime.c
index c03bb652677e60bd77cf5e04f1ae899f219ad44e..d617544dad125013f2ee00552f6b29566cf48ce4 100644 (file)
--- a/dump/unctime.c
+++ b/dump/unctime.c
@@ -41,10 +41,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: unctime.c,v 1.11 2001/06/18 10:58:28 stelian Exp $";
+       "$Id: unctime.c,v 1.12 2001/07/18 09:12:05 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
+#include <sys/time.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>