--- loncom/build/make_rpm.pl	2000/12/12 16:55:16	1.5
+++ loncom/build/make_rpm.pl	2001/01/10 17:00:34	1.8
@@ -87,6 +87,163 @@ print RPMMACROS <<END;
 END
 close RPMMACROS;
 
+# This needs to be dynamically based upon doc/otherfiles/rpm_list.txt
+# at some point.
+my $requires="";
+if ($tag eq "setup") {
+    $requires=<<END;
+PreReq: setup
+END
+}
+elsif ($tag eq "base") {
+    $requires=<<END;
+PreReq: LON-CAPA-setup
+PreReq: apache
+PreReq: /etc/httpd/conf/access.conf
+END
+    $requires2=<<END;
+Requires: LON-CAPA-setup
+Requires: raidtools
+Requires: ncurses
+Requires: popt
+Requires: tcsh
+Requires: redhat-release
+Requires: diffutils
+Requires: ed
+Requires: dialog
+Requires: rmt
+Requires: sed
+Requires: which
+Requires: gawk
+Requires: mingetty
+Requires: info
+Requires: portmap
+Requires: openssh-clients
+Requires: openssh
+Requires: openssh-server
+Requires: openssl
+Requires: basesystem
+Requires: ldconfig
+Requires: filesystem
+Requires: mktemp
+Requires: termcap
+Requires: shadow-utils
+Requires: libtermcap
+Requires: MAKEDEV
+Requires: utempter
+Requires: bash
+Requires: logrotate
+Requires: SysVinit
+Requires: chkconfig
+Requires: textutils
+Requires: pwdb
+Requires: vixie-cron
+Requires: procps
+Requires: modutils
+Requires: psmisc
+Requires: sysklogd
+Requires: authconfig
+Requires: zlib
+Requires: sh-utils
+Requires: mailcap
+Requires: anacron
+Requires: bc
+Requires: bdflush
+Requires: bind-utils
+Requires: cpio
+Requires: crontabs
+Requires: etcskel
+Requires: e2fsprogs
+Requires: samba-client
+Requires: apache-devel
+Requires: autofs
+Requires: findutils
+Requires: gdbm
+Requires: getty_ps
+Requires: readline
+Requires: glib10
+Requires: inetd
+Requires: losetup
+Requires: gnupg
+Requires: gpgp
+Requires: urw-fonts
+Requires: mailx
+Requires: gzip
+Requires: ld.so
+Requires: less
+Requires: passwd
+Requires: sysreport
+Requires: ncompress
+Requires: mount
+Requires: lilo
+Requires: bzip2
+Requires: grep
+Requires: memprof
+Requires: mars-nwe
+Requires: pidentd
+Requires: procinfo
+Requires: units
+Requires: routed
+Requires: quota
+Requires: pam
+Requires: stat
+Requires: setserial
+Requires: mod_perl
+Requires: rootfiles
+Requires: nfs-utils
+Requires: sendmail
+Requires: sharutils
+Requires: tmpwatch
+Requires: shapecfg
+Requires: tcp_wrappers
+Requires: unzip
+Requires: tetex-dvips
+Requires: tetex-afm
+Requires: tetex-latex
+Requires: xntp3
+Requires: rpm
+Requires: wu-ftpd
+Requires: setup
+Requires: glibc
+Requires: fileutils
+Requires: initscripts
+Requires: netatalk
+Requires: apache
+Requires: bash2
+Requires: dev
+Requires: samba
+Requires: ghostscript
+Requires: kernel-headers
+Requires: kernel
+Requires: linuxconf
+Requires: tetex
+Requires: tetex-fonts
+Requires: util-linux
+Requires: vim-common
+Requires: perl
+Requires: cracklib
+Requires: cracklib-dicts
+Requires: cdrecord
+Requires: ghostscript-fonts
+Requires: libgr
+Requires: libjpeg
+Requires: libpng
+Requires: libungif-progs
+Requires: libtiff
+Requires: libungif
+Requires: samba-common
+Requires: ImageMagick
+Requires: libgr-progs
+Requires: man-pages
+Requires: tar
+Requires: vim-minimal
+END
+}
+else {
+    $requires=<<END;
+Requires: LON-CAPA-base
+END
+}
 open (SPEC,">$tag/SPECS/LON-CAPA-$tag-$version.spec");
 
 print SPEC <<END;
@@ -100,6 +257,7 @@ Copyright: GNU General Public License. V
 Group: Utilities/System
 Source: LON-CAPA-$tag-$version.tar.gz
 AutoReqProv: no
+$requires
 # requires: filesystem
 \%description
 This package is automatically generated by the make_rpm.pl perl
@@ -216,7 +374,7 @@ sub find_info {
 	return ("directories",split(/\t/,$line));
     }
     elsif (($line=`find $file -type l -prune`)=~/^$file\n/) {
-	$line=`find $file -type l -prune -printf "\%h/\%l\t\%m\t\%u\t\%g"`;
+	$line=`find $file -type l -prune -printf "\%l\t\%m\t\%u\t\%g"`;
 	return ("links",split(/\t/,$line));
     }