[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. fcac52e93c675fb28aeb17295c534d5986886139
Evergreen Git
git at git.evergreen-ils.org
Thu May 3 22:20:14 EDT 2012
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, rel_2_2 has been updated
via fcac52e93c675fb28aeb17295c534d5986886139 (commit)
via e625cada38ea808b6a52c766e065c4700142209e (commit)
via f0f22b278cfc903561dc2d819e05f41c7ebe1e2c (commit)
from a63fd6ce5d3007803a71d42b823aa32613f14cc8 (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 fcac52e93c675fb28aeb17295c534d5986886139
Author: Dan Scott <dan at coffeecode.net>
Date: Mon Apr 9 16:31:06 2012 -0400
Prereqs: Remove Ubuntu Hardy references
We no longer support Ubuntu Hardy 8.04, so ditch any references to it in
the prerequisite installer.
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 27d197d..ee058c4 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -112,11 +112,6 @@ EXTRA_DEBS_PRECISE = \
libnet-z3950-simple2zoom-perl \
libuuid-tiny-perl
-# Ubuntu Hardy requires libencode-perl # to get a version of Encode
-# > 2.12 - see bug 525069.
-EXTRA_ENCODE = \
- libencode-perl
-
FEDORA_RPMS = \
aspell \
aspell-en \
@@ -467,10 +462,6 @@ install_extra_debs_precise: install_extra_debs
install_extra_debs:
$(APT_TOOL) install $(EXTRA_DEBS)
-# Install specific modules required by Ubuntu Hardy - see bug 525069
-install_extra_encode:
- $(APT_TOOL) install $(EXTRA_ENCODE)
-
# ------------------------------------------------------------------
# FEDORA
commit e625cada38ea808b6a52c766e065c4700142209e
Author: Dan Scott <dan at coffeecode.net>
Date: Mon Apr 9 16:29:46 2012 -0400
Prereqs: update to latest available versions
* JavaScript-SpiderMonkey: from 0.20 to 0.21
* libjs: from 1.7.0 to 185-1.0.0
* yaz: from 4.2.17 to 4.2.32
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index f501fb0..27d197d 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -21,8 +21,8 @@
# Make any assumptions about the shell being used explicit
SHELL=/bin/bash
-LIBJS=js-1.7.0
-LIBJS_PERL=JavaScript-SpiderMonkey-0.20
+LIBJS=js185-1.0.0
+LIBJS_PERL=JavaScript-SpiderMonkey-0.21
LIBJS_URL=http://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
# used for installing libjs lib and header files
@@ -39,7 +39,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-4.2.17
+YAZ=yaz-4.2.32
YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
APT_TOOL=aptitude -yq
commit f0f22b278cfc903561dc2d819e05f41c7ebe1e2c
Author: Dan Scott <dan at coffeecode.net>
Date: Mon Apr 9 16:23:08 2012 -0400
Prereqs: Remove references to CentOS / RHEL
The prereqs were focused on the 5.x series for CentOS and RHEL, which is
hella-out-of-date and never really worked anyway. Get rid of the noise
to focus on the signal.
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 6905c70..f501fb0 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,8 +4,7 @@
#
# Makefile to install prerequisites for OpenSRF and Evergreen
#
-# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (16).
-# Working towards support of CentOS 5 / RHEL 5.
+# Currently supports Debian (squeeze), Ubuntu (10.04), Ubuntu (12.04) and Fedora (16).
# Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
#
# usage:
@@ -13,16 +12,9 @@
# - or -
# make -f Makefile.install ubuntu-lucid
# - or -
-# make -f Makefile.install fedora16
-# - or -
-# make -f Makefile.install centos
+# make -f Makefile.install ubuntu-precise
# - or -
-# make -f Makefile.install rhel
-#
-# Notes:
-#
-# This makefile has been tested much more with Debian, Ubuntu, and
-# Fedora than CentOS, or RHEL.
+# make -f Makefile.install fedora16
#
# ---------------------------------------------------------------------
@@ -50,28 +42,16 @@ LIBDBI_HOST=http://open-ils.org/~denials/evergreen
YAZ=yaz-4.2.17
YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
-# Business::OnlinePayment is not packaged on CentOS/RHEL
-PAY_ONLINE=Business-OnlinePayment-3.00_08.tar.gz
-PAY_ONLINE_HOST=http://ftp.perl.org/pub/CPAN/authors/id/I/IV/IVAN/
-
APT_TOOL=aptitude -yq
APT_SAFE_TOOL=aptitude -P
APT_BACKPORT_TOOL=aptitude -t squeeze-backports -yq
-# 64 or 32 bit os?
-LBITS=$(shell getconf LONG_BIT)
-
# Fedora?
FEDORA=$(shell uname -r | grep "\.fc[0-9][0-9]\.")
# Fedora 64-bit?
FEDORA_64=$(shell uname -r | grep "\.fc[0-9][0-9]\.x86_64")
-#RHEL/Centos PGSQL
-PGSQL_HOST=http://yum.pgsqlrpms.org/reporpms/9.0
-PGSQL_CENTOS=pgdg-centos-9.0-2.noarch.rpm
-PGSQL_REDHAT=pgdg-redhat-9.0-2.noarch.rpm
-
# Debian dependencies
DEBS = \
apache2-prefork-dev\
@@ -137,37 +117,6 @@ EXTRA_DEBS_PRECISE = \
EXTRA_ENCODE = \
libencode-perl
-CENTOS = \
- aspell \
- aspell-devel \
- aspell-en \
- gd-devel \
- libssh2-devel \
- openssl-devel \
- perl-parent \
- perl-Business-CreditCard \
- perl-Business-ISBN \
- perl-Business-ISBN-Data \
- perl-Business-OnlinePayment \
- perl-Class-Data-Inheritable \
- perl-DateTime-Format-Builder \
- perl-DateTime-Format-Strptime \
- perl-Ima-DBI \
- perl-DBD-Pg \
- perl-GD-Graph3d \
- perl-IO-stringy \
- perl-Spreadsheet-WriteExcel \
- perl-Text-Aspell \
- perl-Text-CSV
-
-CENTOS_PERL = \
- Encode \
- DBIx::ContextualFetch \
- Getopt::Long \
- Net::SSH2 \
- Net::XMPP \
- Net::Z3950::ZOOM
-
FEDORA_RPMS = \
aspell \
aspell-en \
@@ -316,10 +265,6 @@ all:
# these should be the same for any distro
install: install_cpan install_js_sm install_cpan_force
-centos: install_centos_pgsql centos_like
-rhel: install_redhat_pgsql centos_like
-centos_like: install_centos_rpms install_yaz install_cpan_marc install install_centos_perl create_ld_local install_cpan_safe install_libdbi
-
fedora16: install_fedora_rpms install_cpan_fedora install_cpan_marc install
debian-squeeze: squeeze generic_debian
@@ -536,39 +481,6 @@ install_fedora_rpms:
install_fedora_pgsql_server:
yum -y install $(PGSQL_FEDORA_RPMS)
-# CENTOS
-install_centos_rpms:
- yum -y install $(CENTOS)
- yum -y update
- if [ $(LBITS) -eq 64 ]; then \
- ln -sf /usr/lib64/libpq.* /usr/lib/ && \
- ln -sf /usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/CORE/libperl.so /usr/lib/ && \
- ldconfig ; \
- fi;
- if [ $(LBITS) -eq 32 ]; then \
- ln -sf /usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE/libperl.so /usr/lib && \
- ldconfig ; \
- fi;
-
-install_centos_pgsql:
- if [ $(LBITS) -eq 64 ]; then yum remove -y postgresql-libs-8.1*i386 apr-util-devel-*i386 ; fi;
- wget $(PGSQL_HOST)/$(PGSQL_CENTOS)
- rpm -Uvh --force ./$(PGSQL_CENTOS)
- yum update -y
- yum -y install $(PGSQL_90_RPMS)
-
-install_redhat_pgsql:
- if [ $(LBITS) -eq 64 ]; then yum remove -y postgresql-libs-8.1*i386 apr-util-devel-*i386 ; fi;
- wget $(PGSQL_HOST)/$(PGSQL_REDHAT)
- rpm -Uvh --force ./$(PGSQL_REDHAT)
- yum update -y
- yum -y install $(PGSQL_90_RPMS)
-
-install_centos_perl:
- for m in $(CENTOS_PERL); do perl -MCPAN -e "install \"$$m\";"; done
- echo "force install Business::OnlinePayment::AuthorizeNet" | perl -MCPAN -e shell
- echo "force install Scalar::Util" | perl -MCPAN -e shell
-
# We need to add /usr/local/lib to the ldconfig list of directories on CentOS,
# if it is not already there
create_ld_local:
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/extras/Makefile.install | 109 ++--------------------------------
1 files changed, 6 insertions(+), 103 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list