From 3e7cbfa71cef994682bdf73b281298aa448bb388 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Tue, 20 Aug 2013 13:02:23 -0400 Subject: [PATCH] Fedora: remove source installs for packaged dependencies The Perl MARC packages, Library::CallNumber::LC, and libdbi / libdbd drivers have been available as packages on Fedora since Fedora 18 (which is now the oldest supported Fedora version), so don't install these from source. Signed-off-by: Dan Scott Signed-off-by: Bill Erickson --- Open-ILS/src/extras/install/Makefile.fedora | 33 ++++----------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.fedora b/Open-ILS/src/extras/install/Makefile.fedora index 37d3f0650c..91363cbbc8 100644 --- a/Open-ILS/src/extras/install/Makefile.fedora +++ b/Open-ILS/src/extras/install/Makefile.fedora @@ -38,16 +38,19 @@ FEDORA_RPMS = \ perl-Locale-Codes \ perl-MARC-Charset \ perl-MARC-Record \ + perl-MARC-XML \ perl-Module-Pluggable \ perl-Net-IP \ perl-Net-SSH2 \ perl-OLE-Storage_Lite \ perl-RPC-XML \ + perl-SOAP-Lite \ perl-Spreadsheet-WriteExcel \ perl-Test-Warn \ perl-Text-Aspell \ perl-Text-CSV \ perl-Text-CSV_XS \ + perl-UUID-Tiny \ perl-XML-Writer \ postgresql-devel \ readline-devel \ @@ -56,32 +59,17 @@ FEDORA_RPMS = \ yaz export CPAN_MODULES = \ - MARC::Record \ - Business::ISBN \ - Business::ISBN::Data \ - MARC::Charset \ - MARC::File::XML \ Net::Z3950::ZOOM \ - Library::CallNumber::LC \ Net::Z3950::Simple2ZOOM \ Template::Plugin::POSIX \ SRU \ Rose::URI export CPAN_MODULES_FORCE = \ - Class::DBI::Frozen::301 - -# Note: B:O:AuthorizeNet 3.21 fails with https://rt.cpan.org/Public/Bug/Display.html?id=55172 -# Should be fixed in 3.22 -# MARC::Record 2.0.1+ is required but only 2.0.0 is packaged -# -# TODO: can contents of FEDORA_CPAN be moved into CPAN_MODULES_FORCE? -FEDORA_CPAN = \ + Class::DBI::Frozen::301 \ Business::OnlinePayment \ Business::OnlinePayment::AuthorizeNet \ - Business::OnlinePayment::PayPal \ - MARC::File::XML \ - UUID::Tiny + Business::OnlinePayment::PayPal PGSQL_FEDORA_RPMS = \ postgresql \ @@ -90,11 +78,10 @@ PGSQL_FEDORA_RPMS = \ postgresql-plperl \ postgresql-server -all: install_fedora_rpms install_cpan_fedora install_js_sm +all: install_fedora_rpms install_js_sm make -f $(DIR)/Makefile.common install_net_z3950_simpleserver make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force - make -f $(DIR)/Makefile.common install_libdbi install_postgres_server: yum -y install $(PGSQL_FEDORA_RPMS) @@ -103,14 +90,6 @@ install_fedora_rpms: yum -y update yum -y install $(FEDORA_RPMS) -install_cpan_fedora: - for m in $(FEDORA_CPAN); do \ - echo "force install $$m" | perl -MCPAN -e shell;\ - done - -install_cpan_marc: install_cpan_marc_record - for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done - install_js_sm: install_libjs install_spidermonkey install_libjs: -- 2.43.2