From: Dan Scott <dscott@laurentian.ca>
Date: Sun, 18 Nov 2012 19:11:09 +0000 (-0500)
Subject: Fedora 17/18 prerequisite updates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fdbs%2Ffedora_perl_packages;p=working%2FEvergreen.git

Fedora 17/18 prerequisite updates

Now that perl-MARC-XML is available in the Fedora 17+ repositories,
there is no longer a need to pull in the Perl MARC packages from CPAN.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index b3a0953de0..c29b38540f 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -142,6 +142,7 @@ FEDORA_RPMS = \
 	perl-Locale-Codes \
 	perl-MARC-Charset \
 	perl-MARC-Record \
+	perl-MARC-XML \
 	perl-Net-IP \
 	perl-Net-SSH2 \
 	perl-OLE-Storage_Lite \
@@ -158,12 +159,13 @@ FEDORA_RPMS = \
 
 # 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
 FEDORA_CPAN = \
+	Business::ISBN \
+	Business::ISBN::Data \
 	Business::OnlinePayment \
 	Business::OnlinePayment::AuthorizeNet \
 	Business::OnlinePayment::PayPal \
-	MARC::File::XML \
+	Net::Z3950::ZOOM \
 	UUID::Tiny
 
 PGSQL_90_RPMS = \
@@ -233,14 +235,6 @@ CPAN_MODULES_MORE = \
 CPAN_MODULES_SAFE = \
 	Safe
 
-# Recent Debian/Ubuntus have libmarc-charset-perl, libmarc-xml-perl, libnet-z3950-zoom-perl
-CPAN_MODULES_MARC = \
-	Business::ISBN \
-	Business::ISBN::Data \
-	MARC::Charset \
-	MARC::File::XML \
-	Net::Z3950::ZOOM
-
 CPAN_MODULES_MARC_RECORD = \
 	MARC::Record
 
@@ -267,7 +261,7 @@ all:
 # these should be the same for any distro
 install: install_cpan install_js_sm install_cpan_force
 
-fedora: install_fedora_rpms install_cpan_fedora install_cpan_marc install
+fedora: install_fedora_rpms install_cpan_fedora install
 
 debian-squeeze: squeeze generic_debian
 squeeze: install_pgsql_client_backport_debs_91  install_extra_debs_squeeze
@@ -299,10 +293,6 @@ install_cpan: install_net_z3950_simpleserver
 install_cpan_more: 
 	for m in $(CPAN_MODULES_MORE); do perl -MCPAN -e "install \"$$m\";"; done
 
-# Install the CPAN modules for MARC functionality
-install_cpan_marc: install_cpan_marc_record
-	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
-
 install_cpan_marc_record:
 	for m in $(CPAN_MODULES_MARC_RECORD); do perl -MCPAN -e "install \"$$m\";"; done