--- apache.spec.sisyphus	2002-11-26 13:51:37 +0300
+++ apache.spec	2003-01-14 16:24:19 +0300
@@ -83,8 +83,7 @@
 
 BuildConflicts: bind-devel
 
-# Automatically added by buildreq on Fri Nov 01 2002
-BuildRequires: libdb1-devel libdb4-devel libgdbm-devel libmm-devel perl-HTML-Parser perl-URI perl-devel perl-libwww-perl
+BuildRequires: libdb4-devel gdbm-devel libmm-devel perl-HTML-Parser perl-URI perl-devel perl-libwww-perl
 
 %description
 Apache is a powerful, full-featured, efficient and freely-available
@@ -348,7 +347,7 @@
 PERL_CC="gcc" \
 PERL_CCFLAGS=`perl -V:ccflags|cut -f 2 -d\'` \
 perl -I$RPM_BUILD_DIR/mod_perl-%mod_perl_version/lib  Makefile.PL \
-    PREFIX=/usr INSTALLDIRS=vendor\
+    PREFIX=/usr \
     USE_APACI=1 \
     APACHE_SRC=../apache-mod_perl_%apache_vanilla_version/src \
     APACHE_HEADER_INSTALL=0 \
@@ -460,9 +459,8 @@
 
 # install mod_perl files
 cd $RPM_BUILD_DIR/mod_perl-%mod_perl_version
-#make pure_install PREFIX=$RPM_BUILD_ROOT%prefix
-%perl_vendor_install
-rm -f $RPM_BUILD_ROOT%perl_vendor_autolib/mod_perl/.packlist
+make pure_install PREFIX=$RPM_BUILD_ROOT%prefix
+rm -f $RPM_BUILD_ROOT%perl_sitearch/auto/mod_perl/.packlist
 install -d -m755 $RPM_BUILD_ROOT%apache_home/html/addon-modules/mod_perl/
 install -m644 htdocs/manual/mod/mod_perl.html \
 	$RPM_BUILD_ROOT%apache_home/html/addon-modules/mod_perl/mod_perl.html
@@ -479,7 +477,7 @@
 install -m644 eg/README \
 	$RPM_BUILD_ROOT%apache_home/html/addon-modules/mod_perl/README.eg
 perl -pi -e 's,/usr/local/bin/perl,%_bindir/perl,' \
-	$RPM_BUILD_ROOT%perl_vendor_archlib/Apache/Resource.pm
+	$RPM_BUILD_ROOT%perl_sitearch/Apache/Resource.pm
 mkdir -p $RPM_BUILD_ROOT%apache_home/perl
 
 # install the init script
@@ -615,11 +613,11 @@
 %config(noreplace) %_sysconfdir/httpd/conf/httpd-perl.conf
 %dir %_sysconfdir/httpd/conf/addon-modules
 %config(noreplace) %_sysconfdir/httpd/conf/addon-modules/proxied_handlers.pl
-%perl_vendor_archlib/Apache*
-%perl_vendor_archlib/Bundle*
-%perl_vendor_archlib/mod_perl*
-%perl_vendor_autolib/Apache*
-#%perl_vendor_man3dir/*
+%perl_sitearch/Apache*
+%perl_sitearch/Bundle*
+%perl_sitearch/mod_perl*
+%perl_sitearch/auto/Apache*
+#%perl_man3dir/*
 %attr(3771,root,%apache_group) %dir %apache_home/perl
 #%attr(755,root,%apache_group) %apache_home/perl/*