Update docs for Fedora install

Fedora 17 is no longer a supported distro; long live Fedora 18/19 and
beyond (and their beautiful packages that let us avoid many source
installs).

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

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 53dcfb6..664a8cb 100644 (file)
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -214,23 +214,12 @@ mkdir /etc/apache2/ssl
 cd /etc/apache2/ssl
 ------------------------------------------------------------------------------
 +
-.Fedora 17
-[source,bash]
-------------------------------------------------------------------------------
-cp Open-ILS/examples/apache/eg.conf       /etc/httpd/conf.d/
-cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/
-cp Open-ILS/examples/apache/eg_startup    /etc/httpd/
-# Now set up SSL
-mkdir /etc/httpd/ssl
-cd /etc/httpd/ssl
-------------------------------------------------------------------------------
-+
-.Fedora 18
+.Fedora
 [source,bash]
 ------------------------------------------------------------------------------
-cp Open-ILS/examples/apache_24/eg.conf       /etc/httpd/conf.d/
-cp Open-ILS/examples/apache_24/eg_vhost.conf /etc/httpd/
-cp Open-ILS/examples/apache/startup.pl       /etc/httpd/
+cp Open-ILS/examples/apache_24/eg_24.conf       /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup          /etc/httpd/
 # Now set up SSL
 mkdir /etc/httpd/ssl
 cd /etc/httpd/ssl
@@ -374,10 +363,8 @@ cpan Rose::URI
 [source, bash]
 ------------------------------------------------------------------------------
 yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN
-cpan Library::CallNumber::LC
-cpan MARC::Record
-cpan MARC::File::XML
-cpan UUID::Tiny
+yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset
+yum install perl-MARC-File-XML perl-UUID-Tiny
 ------------------------------------------------------------------------------
 
 You need to create a PostgreSQL superuser to create and access the database.