changes to get enrpm working

3 files changed, 36 insertions, 25 deletions

diff --git a/rpm/build/BOOTSTRAP b/rpm/build/BOOTSTRAP
index 3fe8d0f79..6ddf5b54d 100644
--- a/rpm/build/BOOTSTRAP
+++ b/rpm/build/BOOTSTRAP
@@ -120,6 +120,26 @@ mkdir -p public_html/repo/centos/5/freeside-1.7/testing/x86_64/
 mkdir public_html/repo/centos/5/freeside-1.7/testing/i686
 
 ###
+# and for enrpm!
+###
+
+vserver centos5 enter
+yum install perl-libwww-perl make
+cpan
+install RPM::Specfile
+#if it fails, might need to go to /root/.cpan/build/RPM-Specfile-* and do it manually
+install YAML
+
+#for user cpan-ability
+mkdir .cpan
+mkdir .cpan/CPAN
+cp /usr/lib/perl5/5.8.8/CPAN/Config.pm  .cpan/CPAN/MyConfig.pm
+vi .cpan/CPAN/MyConfig.pm #and just leave and change the /root ones
+chmod a+rx .cpan/CPAN/MyConfig.pm
+
+#edit ovid2flue and set user
+
+###
 # references
 ###
 
diff --git a/rpm/build/enrpm b/rpm/build/enrpm
index 11f69ba56..3e674bc3a 100755
--- a/rpm/build/enrpm
+++ b/rpm/build/enrpm
@@ -93,22 +93,13 @@ sub usage {
 }
 
 # Feeble excuse for not having a real configuration file
-my $user = 'rsiddall';
-my $buildsys = '/home/rsiddall/work';
-my $rembuild = '/home/rsiddall/work/cvs';
-my $remdeps = '/home/rsiddall';
-my $rpmtopdir = '/home/rsiddall/work/redhat';
-my $packager = 'Richard Siddall <richard.siddall@elirion.net>';
-my $server = 'grosbeak';
-
-if (hostname =~ /wavetail/i) {
-	$buildsys = '/home/rsiddall/buildsys';
-	$rembuild = '/home/rsiddall/buildsys/ref';
-	$remdeps = '/home/rsiddall';
-	$rpmtopdir = '/home/rsiddall/redhat';
-	$packager = 'Ivan Kohler <ivan@freeside.biz>';
-	$server = '10.5.4.5';
-}
+my $user = 'ivan';
+my $buildsys = "/home/$user/buildsys";
+#my $rembuild = '/home/rsiddall/buildsys/ref';
+my $remdeps = '/home/ivan';
+my $rpmtopdir = "/home/$user/redhat";
+my $packager = 'Ivan Kohler <ivan@freeside.biz>';
+my $server = '10.5.4.5';
 
 $server = $opts{server} if defined($opts{server});
 $user = $1 if $server =~ /(\w+)\@[\w\d\.]+/;
@@ -169,11 +160,11 @@ for my $file (@ARGV) {
 	}
 	my $olddir = getcwd();
 	do_cmd("$buildsys/build-freeside");
-	if (-x "$buildsys/refresh-repo") {
+#	if (-x "$buildsys/refresh-repo") {
 		do_cmd("$buildsys/refresh-repo");
-	} else {
-		do_cmd("ssh $user\@$server $rembuild/refresh-repo");
-	}
+#	} else {
+#		do_cmd("ssh $user\@$server $rembuild/refresh-repo");
+#	}
 }
 
 sub do_cmd {
diff --git a/rpm/build/native/ovid2flute b/rpm/build/native/ovid2flute
index 5e26711d5..5bb836116 100755
--- a/rpm/build/native/ovid2flute
+++ b/rpm/build/native/ovid2flute
@@ -36,10 +36,10 @@ $opts{packager} = 'Richard Siddall <richard.siddall@elirion.net>' if !defined($o
 #my @extramods= qw/Crypt::SSLeay/;
 my @extramods= qw/IPC::ShareLite/;
 
-my $specfiledir="/home/rsiddall/work/redhat/SPECS";
-$specfiledir = "/home/rsiddall/redhat/SPECS" if ! -d $specfiledir;
-my $srpmdir="/home/rsiddall/work/redhat/SRPMS";
-$srpmdir = "/home/rsiddall/redhat/SRPMS" if ! -d $srpmdir;
+my $specfiledir="/home/ivan/work/redhat/SPECS";
+$specfiledir = "/home/ivan/redhat/SPECS" if ! -d $specfiledir;
+my $srpmdir="/home/ivan/work/redhat/SRPMS";
+$srpmdir = "/home/ivan/redhat/SRPMS" if ! -d $srpmdir;
 
 foreach (reverse <STDIN>) {
 	next if !defined($_);
@@ -80,7 +80,7 @@ foreach my $name (@extramods) {
 sub touchsrpms {
 	my ($name, $rpm) = @_;
 	my $repofolder ="/var/www/html/repo/sles/10/freeside-1.9/stable/x86_64";
-	my $srpmfolder ="/home/rsiddall/work/redhat/SRPMS";
+	my $srpmfolder ="/home/ivan/work/redhat/SRPMS";
 	my @files = glob "$repofolder/perl-$rpm-*.rpm";
 	if (! scalar(@files)) {
 		print "Can't find $rpm in $repofolder\n";