From 3762864f03c2ed7ccec910d25f7b6b950a1ccdca Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Thu, 10 Nov 2011 01:04:50 -0500 Subject: [PATCH] Fedora 16 updates to README and Makefile.install Fedora 16 is out, we can improve the README and Makefile.install some to better support it. Signed-off-by: Dan Scott --- Open-ILS/src/extras/Makefile.install | 16 ++++++++++++---- README | 9 ++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index ae74df957c..45e7cc9d49 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -4,7 +4,7 @@ # # Makefile to install prerequisites for OpenSRF and Evergreen # -# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (15). +# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (16). # Working towards support of CentOS 5 / RHEL 5. # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz # @@ -13,7 +13,7 @@ # - or - # make -f Makefile.install ubuntu-lucid # - or - -# make -f Makefile.install fedora15 +# make -f Makefile.install fedora16 # - or - # make -f Makefile.install centos # - or - @@ -175,6 +175,7 @@ FEDORA_RPMS = \ perl-Email-Send \ perl-Email-Simple \ perl-GDGraph3d \ + perl-JSON-XS \ perl-Net-IP \ perl-Net-SSH2 \ perl-OLE-Storage_Lite \ @@ -206,6 +207,13 @@ PGSQL_90_RPMS = \ postgresql90-plperl \ postgresql90-server +PGSQL_FEDORA_RPMS = \ + postgresql \ + postgresql-contrib \ + postgresql-libs \ + postgresql-plperl \ + postgresql-server + PGSQL_CLIENT_DEBS_90 = \ libpq5 \ libpq-dev \ @@ -284,7 +292,7 @@ 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_cpan_force -fedora15: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force +fedora16: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force debian-squeeze: squeeze generic_debian squeeze: install_pgsql_client_debs_90 install_extra_debs_squeeze @@ -452,7 +460,7 @@ install_fedora_rpms: yum -y install $(FEDORA_RPMS) install_fedora_pgsql_server: - yum -y install $(PGSQL_90_RPMS) + yum -y install $(PGSQL_FEDORA_RPMS) # CENTOS install_centos_rpms: diff --git a/README b/README index d8311e48df..bc32c272df 100644 --- a/README +++ b/README @@ -99,13 +99,13 @@ apt-get install python-software-properties add-apt-repository ppa:pitti/postgresql ------------------------------------------------------------------------------ + - * Fedora 15 comes with PostgreSQL 9, so no additional steps are required. + * Fedora 16 comes with PostgreSQL 9, so no additional steps are required. + 3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to retrieve the new packages from the backports repository. 4. Issue the following commands as the *root* Linux account to install prerequisites using the `Makefile.install` prerequisite installer, - substituting `debian-squeeze`, `fedora15`, `ubuntu-lucid`, `centos`, or + substituting `debian-squeeze`, `fedora16`, `ubuntu-lucid`, `centos`, or `rhel` for below: + [source, bash] @@ -315,7 +315,7 @@ make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 You can install the packages required by Fedora on the machine of your choice using the following commands as the *root* Linux account: -.(Fedora 15) Installing PostgreSQL 9.0 server packages +.(Fedora 16) Installing PostgreSQL server packages [source, bash] ------------------------------------------------------------------------------ make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server @@ -336,11 +336,10 @@ cpan MARC::File::XML cpan UUID::Tiny ------------------------------------------------------------------------------ -.(Fedora 15) Installing additional Perl modules on a standalone PostgreSQL 9 server +.(Fedora 16) Installing additional Perl modules on a standalone PostgreSQL 9 server [source, bash] ------------------------------------------------------------------------------ yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN -cpan JSON::XS cpan Library::CallNumber::LC cpan MARC::Record cpan MARC::File::XML -- 2.43.2