Applying Mads' fixes

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@573 4979c152-3d1c-0410-bac9-87ea11338e46

5 files changed, 42 insertions, 47 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 18052bc8..474b68df 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -36,8 +36,8 @@ the documentation.
 Christopher Browne <cbrowne @ acm.org> provided some corrections to the 
 documentation, the Pg-tables.sql, and a setup file for replication.
 
-Mads Kiilerich <mads @ kiilerich.com> provided the first version of the RPM 
-spec file.
+Mads Kiilerich <mads @ kiilerich.com> has provided the RPM spec file and
+numerous bug fixes.
 
 Tony Fraser <tony @ sybaspace.com> provided some database fixes.
 
diff --git a/INSTALL b/INSTALL
index ae2ba808..1a17118d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,27 +1,27 @@
 Installing LedgerSMB 1.2 
 
 
-This document contains information on how to upgrade from earlier versions of 
-LedgerSMB or SQL-Ledger.  This upgrade is a major revision and may not go 
-smoothly.  We recommend that the reader start by reading the section on manual
-installation and then start by trying the automated means mentioned later.
+This document contains information on how to install LedgerSMB.  We recommend
+that the reader start by reading the section on manual installation and then
+start by trying the automated means mentioned later.
 
 Also this document assumes that the reader is already familiar with the release
 notes.  If you have not already done so, please read the release_notes file in
 the doc/ directory.
 
-MANUAL UPGRADE:
+MANUAL INSTALL:
 ===============================================================================
 
 1)  Untar in desired location.
 
-2)  Check New Dependencies
+2)  Check Dependencies
 
 The Build.PL script can be used to test for unmet dependencies and run other
 tests.  It doesn't install anything yet, but it will tell you what you are 
 missing.  To check for dependencies, run "perl Build.PL" from the command line.
 Missing dependencies can generally be installed via a Linux distributor's
-package manager or by CPAN.
+package manager or by CPAN. (Build.PL itself uses Module::Build, which is
+available in packages like perl-Module-Build or libmodule-build-perl.)
 
 Once this is done and dependencies are satisfied, you can check to see whether
 the installation nominally works by running "./Build test" from the command
@@ -33,28 +33,17 @@ and may not be required in all circumstances.  These include:
   * Net::TCLink for credit card processing in a POS environment
   * Parse::RecDescent for the CLI script host
 
-3)  Install database
-
-  a) cd to the sql/legacy/ directory of the new ledger directory
-  b) run "psql" with appropriate options to connect to your database.
-  c) Note the db version by running the following query:
-     "SELECT version FROM defaults;"
-  d) Run the SQL upgrade scripts in order starting with the one whose name
-     begins with "Pg-database" (each of these scripts will upgrade to
-     the next database version which is also identified in the file name).
-
-Note that this will create three tables that may not actually be used depending
-on your setup:  users, users_conf, and session.  In general if you have multiple
-datasets, these tables will only be used in one.
-
-4)  Decide where to put the user/session management tables.  In general, we
+3)  Decide where to put the user/session management tables.  In general, we
 recommend as follows:
   a)  Single dataset installations should use the user tables in the dataset.
   b)  Multicompany installations should use user tables in a separate dataset
       from any accounting data.
 
-If you need to create another dataset, you can create the db and import the
-sql/Pg-central.sql file into it.
+4)  Create central database
+
+  a) cd to the sql/ directory of the new ledger directory.
+  b) run "psql" with appropriate options to connect to your database.
+  c) Run the SQL script Pg-central.sql.
 
 5)  Set the admin password:
   a)  From psql, determine what admin password you wish to use.  Then type:
diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec
index dfef1671..2ea6095f 100644
--- a/dists/rpm/ledgersmb.spec
+++ b/dists/rpm/ledgersmb.spec
@@ -28,15 +28,18 @@ This package does not work in SELinux restricted mode.
 
 To finalize the ledger-smb installation:
 
-Start the PostgreSQL service, let /var/lib/pgsql/data/pg_hba.conf start with:
+Enable local password autentication in PosgreSQL, leaving ident login for the
+postgres user:
+- Start PostgreSQL to create database instance (service postgres start)
+- Let /var/lib/pgsql/data/pg_hba.conf start with:
 local   all         postgres                          ident sameuser
 local   all         all                               md5
 host    all         all         127.0.0.1/32          md5
-(Remember to restart PostgreSQL.)
+- Restart PostgreSQL to apply changes (service postgres restart)
 
 In %{_sysconfdir}/%{name}/ledger-smb.conf set DBPassword to something
 and create the ledgersmb master user and database:
-su - postgres -c "createuser -d ledgersmb --createdb --createrole --superuser -P"
+su - postgres -c "createuser -d ledgersmb --createdb --superuser -P"
 su - postgres -c "createdb ledgersmb"
 su - postgres -c "createlang plpgsql ledgersmb"
 su - postgres -c "psql ledgersmb < %{_datadir}/%{name}/sql/Pg-central.sql"
@@ -89,44 +92,44 @@ mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} # /var/spool/ledg
 # the conf, placed in etc, symlinked back in place
 mv ledger-smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/ledger-smb/ledger-smb.conf
 ln -s ../../..%{_sysconfdir}/ledger-smb/ledger-smb.conf \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/ledger-smb.conf
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/ledger-smb.conf
 
 # install relevant parts in data/cgi directory
-cp -rp *.pl favicon.ico index.html ledger-smb.gif ledger-smb.png ledger-smb_small.png menu.ini \
- bin LedgerSMB sql utils locale drivers \
- Config Class Locale \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/
+cp -rp *.pl favicon.ico index.html ledger-smb.eps ledger-smb.gif ledger-smb.png ledger-smb_small.png menu.ini \
+  bin LedgerSMB sql utils locale drivers \
+  Config Class Locale \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/{setup.pl,SL2LS.pl} # FIXME - install somewhere else...
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/legacy
 
 # users - written to by cgi
 mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/users
 ln -s ../../..%{_localstatedir}/lib/%{name}/users \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/users
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/users
 
 # css - written to by cgi
 mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/css
 ln -s ../../..%{_localstatedir}/lib/%{name}/css \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/css
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/css
 cp -rp css/* \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/css
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/css
 
 # templates - written to by cgi
 mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/templates
 ln -s ../../..%{_localstatedir}/lib/%{name}/templates \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
 cp -rp templates/* \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
 
 # spool - written to by cgi
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
 ln -s ../../..%{_localstatedir}/spool/%{name} \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/spool
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/spool
 
 # apache config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 install -m 644 rpm-ledger-smb-httpd.conf \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ledger-smb.conf
+  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ledger-smb.conf
 
 
 %clean
@@ -146,15 +149,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
-%doc doc/{COPYRIGHT,LedgerSMB-manual.pdf,README,faq.html,release_notes}
-%doc LICENSE README.sql-ledger README.translations TODO Changelog CONTRIBUTORS
+%doc doc/{COPYRIGHT,faq.html,LedgerSMB-manual.pdf,README,release_notes}
+%doc BUGS Changelog CONTRIBUTORS INSTALL LICENSE README.sql-ledger README.translations TODO UPGRADE
 
 
 %changelog
-* Fri Nov 10 2006 Mads Kiilerich <mads@kiilerich.com> - 1.2 alpha
+* Fri Nov 10 2006 Mads Kiilerich <mads@kiilerich.com> - 1.2-alpha
 - Updating towards 1.2
 
 * Wed Oct 18 2006 Mads Kiilerich <mads@kiilerich.com> - 1.1.1d-1
 - Initial version
-
-
diff --git a/ledger-smb-httpd.conf b/ledger-smb-httpd.conf
index 92aeb65f..4c341da2 100644
--- a/ledger-smb-httpd.conf
+++ b/ledger-smb-httpd.conf
@@ -23,6 +23,11 @@ Alias /ledger-smb /some/path/to/ledger-smb/
   Deny from All
 </Directory>
   
+<Directory /some/path/to/ledger-smb/utils>
+  Order Deny,Allow
+  Deny from All
+</Directory>
+  
 <Directory /some/path/to/ledger-smb/spool>
   Order Deny,Allow
   Deny from All
diff --git a/locale/po/da.po b/locale/po/da.po
index 932d5f06..7d9012d1 100755
--- a/locale/po/da.po
+++ b/locale/po/da.po
@@ -342,7 +342,7 @@ msgid "BOM"
 msgstr "BOM"
 
 msgid "Backup"
-msgstr "Sikkerheskopi"
+msgstr "Sikkerhedskopi"
 
 msgid "Backup sent to"
 msgstr "Sikkerhedskopier sendt til"