From 7194fde763d6a0047687622df0d1d9aa82ba93da Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sat, 10 Sep 2011 12:36:14 -0400 Subject: [PATCH] Remove references to Fedora 13 and 14 Fedora 13 has not been supported for months, Fedora 14 is about to lose support. Simplifies README and prereq installer a bit. Signed-off-by: Dan Scott --- Open-ILS/src/extras/Makefile.install | 11 +++++------ README | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 27d6e850df..0812736ecb 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 (14). +# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (15). # 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 fedora14 +# make -f Makefile.install fedora15 # - or - # make -f Makefile.install centos # - or - @@ -272,8 +272,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 -fedora14: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force -fedora15: fedora14 +fedora15: 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 @@ -309,7 +308,7 @@ install_cpan_force: install_cpan_safe: for m in $(CPAN_MODULES_SAFE); do perl -MCPAN -e "install \"$$m\";"; done -# Install the CPAN modules for Fedora 13 +# Install the CPAN modules for Fedora install_cpan_fedora: for m in $(FEDORA_CPAN); do \ echo "force install $$m" | perl -MCPAN -e shell;\ @@ -427,7 +426,7 @@ install_extra_encode: # ------------------------------------------------------------------ -# FEDORA 13 +# FEDORA install_fedora_rpms: yum -y update yum -y install $(FEDORA_RPMS) diff --git a/README b/README index b9c3eb021a..16a83aff87 100644 --- a/README +++ b/README @@ -26,9 +26,6 @@ deb http://backports.debian.org/debian-backports squeeze-backports main contrib deb http://archive.ubuntu.com/ubuntu lucid-backports main universe multiverse restricted ------------------------------------------------------------------------------ + - * On Fedora 14, follow the http://yum.pgrpms.org/howtoyum.php[instructions - in the Yum HOWTO] to enable the PostgreSQL RPM Building Project yum - repository. * Fedora 15 comes with PostgreSQL 9, so no additional steps are required. + 3. On Debian and Ubuntu, run `aptitude update` to retrieve the new packages @@ -38,7 +35,7 @@ deb http://archive.ubuntu.com/ubuntu lucid-backports main universe multiverse re installer. 5. Issue the following commands as the root user to install prerequisites using the Makefile.install prerequisite installer, substituting - `debian-squeeze`, `fedora15`, `fedora14`, `ubuntu-lucid`, `centos`, or + `debian-squeeze`, `fedora15`, `ubuntu-lucid`, `centos`, or `rhel` for below: + [source, bash] -- 2.11.0