[open-ils-commits] [GIT] Evergreen ILS branch master updated. 20f9733c135ddff42242ee66df9abc4eb3532e9b

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  20f9733c135ddff42242ee66df9abc4eb3532e9b (commit)
       via  987be97fe33add57240b6b85588d9fa45b1f48e0 (commit)
      from  c0d38352beda1142d7f1bcff5c6e5bd78ce24093 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 20f9733c135ddff42242ee66df9abc4eb3532e9b
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sun Oct 16 15:48:38 2011 -0400

    Net::Z3950::SimpleServer 1.15 should not require sedding
    
    Checking both versions of the packages listed on ftp.indexdata.dk, the
    hardcoded path to yaz-config does not exist in Makefile.PL - thus, we
    should be able to drop the "sed" instruction for 1.15.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 9e9cef2..879cf00 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -378,7 +378,6 @@ install_spidermonkey:
 install_net_z3950_simpleserver:
 	if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; fi;
 	tar -zxf $(LIBNET_Z3950_SIMPLESERVER).tar.gz
-	sed -i -e 's/..\/..\/yaz-config/yaz-config/' $(LIBNET_Z3950_SIMPLESERVER)/Makefile.PL;
 	cd $(LIBNET_Z3950_SIMPLESERVER) && perl Makefile.PL && make && make test && make install
 
 # On Ubuntu and possibly Debian, the libdbi0 package prevents the 

commit 987be97fe33add57240b6b85588d9fa45b1f48e0
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sun Oct 16 11:40:59 2011 -0400

    Install yaz-4.2 and Net::Z3950::Simpleserver 1.15
    
    Net::Z3950::Simpleserver 1.14+ requires yaz 4.2.x, as well as currently
    suffering from a Makefile.PL problem that involves a hard-coded path to
    yaz-config (https://rt.cpan.org/Public/Bug/Display.html?id=70444).
    Provide a sed command to resolve the latter problem and upgrade our
    "current version of yaz" to yaz 4.2.x.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 45e7cc9..9e9cef2 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -36,6 +36,9 @@ LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJ
 # used for installing libjs lib and header files
 JS_INSTALL_PREFIX=/usr/
 
+LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.15
+LIBNET_Z3950_SIMPLESERVER_URL=http://ftp.indexdata.dk/pub/simpleserver/$(LIBNET_Z3950_SIMPLESERVER)
+
 # The libdbi sources can be fetched from sourceforge.net.  They are stored on
 # the open-ils.org site now for ease of direct linking
 LIBDBI=libdbi-0.8.3
@@ -44,7 +47,7 @@ LIBDBI_HOST=http://open-ils.org/~denials/evergreen
 
 # We need a recent version of Yaz
 # Debian Lenny and Ubuntu 8.10 come with 3.0.34
-YAZ=yaz-3.0.47
+YAZ=yaz-4.2.17
 YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
 
 # Business::OnlinePayment is not packaged on CentOS/RHEL
@@ -242,11 +245,9 @@ DEB_APACHE_DISMODS = \
     deflate
 
 # Chronically unpackaged CPAN modules
-# Note older version of Net::Z3950::SimpleServer to avoid yaz 4.1.x dependency
 CPAN_MODULES = \
 	Business::EDI \
 	Library::CallNumber::LC \
-	M/MI/MIRK/Net-Z3950-SimpleServer-1.12.tar.gz \
 	Net::Z3950::Simple2ZOOM \
 	Template::Plugin::POSIX \
 	SRU
@@ -305,7 +306,7 @@ generic_ubuntu: install_debs test_for_libdbi_pkg install debian_sys_config insta
 # - COMMON TARGETS ---------------------------------------------------------
 
 # Install the CPAN modules
-install_cpan: 
+install_cpan: install_net_z3950_simpleserver
 	for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done
 
 install_cpan_more: 
@@ -374,6 +375,12 @@ install_spidermonkey:
 	fi;
 	cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
 
+install_net_z3950_simpleserver:
+	if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; fi;
+	tar -zxf $(LIBNET_Z3950_SIMPLESERVER).tar.gz
+	sed -i -e 's/..\/..\/yaz-config/yaz-config/' $(LIBNET_Z3950_SIMPLESERVER)/Makefile.PL;
+	cd $(LIBNET_Z3950_SIMPLESERVER) && perl Makefile.PL && make && make test && make install
+
 # On Ubuntu and possibly Debian, the libdbi0 package prevents the 
 # compiled-from-source version from being used and breaks the install.
 # This package might get installed depending on the install-time choices

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS