summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog1
-rw-r--r--dists/rpm/ledgersmb.spec32
-rw-r--r--dists/source/build.sh1
3 files changed, 18 insertions, 16 deletions
diff --git a/Changelog b/Changelog
index 8059b9d0..cb9027de 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
Since last Release Candidate:
* A few bind variable errors have been corrected.
* ledger-smb.conf is now ledgersmb.conf
+* Database schema information added to doc/database
Changelog for LedgerSMB 1.2.0
diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec
index 20543253..2cf3fad8 100644
--- a/dists/rpm/ledgersmb.spec
+++ b/dists/rpm/ledgersmb.spec
@@ -26,7 +26,7 @@ and many advanced features.
This package does not work in SELinux restricted mode.
-To finalize the ledger-smb installation:
+To finalize the ledgersmb installation:
Enable local password autentication in PosgreSQL, leaving ident login for the
postgres user:
@@ -37,7 +37,7 @@ local all all md5
host all all 127.0.0.1/32 md5
- Restart PostgreSQL to apply changes (service postgres restart)
-In %{_sysconfdir}/%{name}/ledger-smb.conf set DBPassword to something
+In %{_sysconfdir}/%{name}/ledgersmb.conf set DBPassword to something
and create the ledgersmb master user and database:
su - postgres -c "createuser -d ledgersmb --createdb --superuser -P"
su - postgres -c "createdb ledgersmb"
@@ -46,12 +46,12 @@ su - postgres -c "psql ledgersmb < %{_datadir}/%{name}/sql/Pg-central.sql"
Bleeding edge hint: Set password to avoid bogus web prompt:
su - postgres -c "psql ledgersmb -c \"update users_conf set password = md5('yada') where id = 1;\""
-Visit http://localhost/ledger-smb/admin.pl with password "yada" and create an
+Visit http://localhost/ledgersmb/admin.pl with password "yada" and create an
application database and users.
%prep
-%setup -q -n ledger-smb
+%setup -q -n ledgersmb
# Include code from perl packages not available in the standard distribution
mkdir .tmperl
@@ -71,28 +71,28 @@ chmod +x utils/*/*.pl utils/devel/find-use utils/pos/pos-hardware-client-startup
%build
-cat << TAK > rpm-ledger-smb-httpd.conf
-Alias /ledger-smb/doc/LedgerSMB-manual.pdf %{_docdir}/%{name}-%{version}/LedgerSMB-manual.pdf
+cat << TAK > rpm-ledgersmb-httpd.conf
+Alias /ledgersmb/doc/LedgerSMB-manual.pdf %{_docdir}/%{name}-%{version}/LedgerSMB-manual.pdf
<Files %{_docdir}/%{name}-%{version}/LedgerSMB-manual.pdf>
</Files>
TAK
-perl -p -e "s,/some/path/to/ledger-smb,%{_datadir}/%{name},g" ledger-smb-httpd.conf >> rpm-ledger-smb-httpd.conf
+perl -p -e "s,/some/path/to/ledgersmb,%{_datadir}/%{name},g" ledgersmb-httpd.conf >> rpm-ledgersmb-httpd.conf
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p -m0755 $RPM_BUILD_ROOT%{_datadir}/%{name} # /usr/lib/ledger-smb - readonly code and cgi directory
-mkdir -p -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name} # /etc/ledger-smb - configs
-mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} # /var/lib/ledger-smb - data files, modified by cgi
-mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} # /var/spool/ledger-smb - spool files, modified by cgi
+mkdir -p -m0755 $RPM_BUILD_ROOT%{_datadir}/%{name} # /usr/lib/ledgersmb - readonly code and cgi directory
+mkdir -p -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name} # /etc/ledgersmb - configs
+mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} # /var/lib/ledgersmb - data files, modified by cgi
+mkdir -p -m0750 $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} # /var/spool/ledgersmb - spool files, modified by cgi
# 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
+mv ledgersmb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/ledgersmb/ledgersmb.conf
+ln -s ../../..%{_sysconfdir}/ledgersmb/ledgersmb.conf \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/ledgersmb.conf
# install relevant parts in data/cgi directory
cp -rp *.pl favicon.ico index.html ledger-smb.eps ledger-smb.gif ledger-smb.png ledger-smb_small.png menu.ini \
@@ -127,8 +127,8 @@ ln -s ../../..%{_localstatedir}/spool/%{name} \
# 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
+install -m 644 rpm-ledgersmb-httpd.conf \
+ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ledgersmb.conf
%clean
diff --git a/dists/source/build.sh b/dists/source/build.sh
index ce9faf16..43a9ba59 100644
--- a/dists/source/build.sh
+++ b/dists/source/build.sh
@@ -32,6 +32,7 @@ cp -R * $build_d/ledgersmb
cd $build_d/ledgersmb
pwd
find -name '*.svn' -exec rm -rf '{}' ';'
+find -name '*.rej' -exec rm -rf '{}' ';'
rm ledger-smb.conf
rm ledgersmb.conf
cd doc/database