--- loncom/build/make_rpm.pl	2001/01/08 17:57:06	1.7
+++ loncom/build/make_rpm.pl	2001/05/16 19:30:05	1.11
@@ -4,9 +4,6 @@
 # Automatically generate RPM listing files
 # from file listing.
 
-# GNU General Public License, Version 2, June 1991
-# See http://www.gnu.org/copyleft/gpl.html.
-
 # This script does actually "build" the RPM.
 
 # This script also generates and then deletes temporary
@@ -71,7 +68,7 @@ open (RPMRC,">$tag/SPECS/rpmrc");
 foreach $line (@lines) {
     if ($line=~/^macrofiles/) {
 	chop $line;
-	$line.=":./rpmmacros\n";
+	$line.=":$currentdir/SPECS/rpmmacros\n";
     }
     print RPMRC $line;
 }
@@ -92,15 +89,19 @@ close RPMMACROS;
 my $requires="";
 if ($tag eq "setup") {
     $requires=<<END;
-Requires: setup
+PreReq: setup
+PreReq: passwd
+PreReq: util-linux
 END
 }
 elsif ($tag eq "base") {
     $requires=<<END;
-Requires: LON-CAPA-base
-Requires: LON-CAPA-krb4
-Requires: LON-CAPA-mysql
-Requires: LON-CAPA-systemperl
+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
@@ -251,7 +252,7 @@ Version: $version
 Release: 1
 Vendor: Laboratory for Instructional Technology Education, Division of Science and Mathematics Education, Michigan State University.
 BuildRoot: $currentdir/BuildRoot
-Copyright: GNU General Public License. Version 2, June 1991.  Michigan State University patents may apply.
+Copyright: Michigan State University patents may apply.
 Group: Utilities/System
 Source: LON-CAPA-$tag-$version.tar.gz
 AutoReqProv: no
@@ -281,7 +282,7 @@ echo "http://www.lon-capa.org/"
 echo "Gerd Kortemeyer, et al"
 echo "Laboratory for Instructional Technology Education"
 echo "Michigan State University"
-echo "General Public License, Version 2, June 1991"
+echo " "
 echo "** Michigan State University patents may apply **"
 echo " "
 echo "This installation assumes an installation of Redhat 6.2"