- some cleanups and path bugfixes

Changed files:
    pbx.spec -> 1.4

1 files changed, 29 insertions, 31 deletions

diff --git a/pbx.spec b/pbx.spec
index c88800b..67be5be 100644
--- a/pbx.spec
+++ b/pbx.spec
@@ -1,4 +1,3 @@
-#
 Summary:	Phone billing system
 Summary(pl):	System bilingowy połączeń telefonicznych
 Name:		pbx
@@ -8,9 +7,8 @@ License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://duch.mimuw.edu.pl/~hunter/%{name}-%{version}.tar.gz
 # Source0-md5:	df997f519b7088b327aa612ef12e0fdb
-#Patch0:		%{name}-what.patch
 Source1:	%{name}.sysconfig
-URL:		http://pbx.sf.net
+URL:		http://pbx.sf.net/
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -21,22 +19,24 @@ phone centrals.
 
 The billing part of that package is written in PHP and can calculate
 call cost based on a set of "cost configuration parameters":
-currencies, cos, time (on-peak,off-peak), dialed number, etc.
+currencies, cost, time (on-peak, off-peak), dialed number, etc.
 
 %description -l pl
-Pbx jest systemem księgowania bilingowania połączeń telefonicznych. 
-Wykorzystuje on funkcję SMDR (Station Message Detailed Recording) którą 
-posiadają wszystkie współczesne centrale telefoniczne.
+Pbx jest systemem księgowania/bilingowania połączeń telefonicznych.
+Wykorzystuje on funkcję SMDR (Station Message Detailed Recording)
+którą posiadają wszystkie współczesne centrale telefoniczne.
 
-System bilingowo-prezentacyjny wykonany jest w PHP.
+System bilingowo-prezentacyjny wykonany jest w PHP i może obliczać
+koszt połączeń w oparciu o zbiór "parametrów konfigurujących koszty":
+walut, cen, czasu (w szczycie, poza szczytem), wybieranego numeru itp.
 
 %package php
-Summary: Phone billing system	
-Summary(pl):	System bilingowy połączeń telefonicznych. 
+Summary:	Phone billing system	
+Summary(pl):	System bilingowy połączeń telefonicznych.
 Group:		Applications/Communications
 
 %description php
-This is php part of PBX. 
+This is PHP part of PBX. 
 
 %description php -l pl
 To jest część systemu PBX używająca PHP. 
@@ -46,38 +46,36 @@ To jest część systemu PBX używająca PHP.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/rc.d/init.d/pbx,%{_datadir}/pbx/{css,img,tpl}}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_datadir}/pbx/{css,img,tpl}}
+install -d $RPM_BUILD_ROOT/etc/sysconfig
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -d $RPM_BUILD_ROOT/var/lib/%{name}/{log,run,scripts}
 
-install util/pbx $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/pbx
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/pbx
+install util/pbx $RPM_BUILD_ROOT/etc/rc.d/init.d/pbx
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/pbx
 
 install html/css/styles.css $RPM_BUILD_ROOT%{_datadir}/pbx/css/styles.css
-install html/img/*.gif $RPM_BUILD_ROOT%{_datadir}/pbx/img/
-install html/tpl/*.tpl $RPM_BUILD_ROOT%{_datadir}/pbx/tpl/
-install html/*.php $RPM_BUILD_ROOT%{_datadir}/pbx/
+install html/img/*.gif $RPM_BUILD_ROOT%{_datadir}/pbx/img
+install html/tpl/*.tpl $RPM_BUILD_ROOT%{_datadir}/pbx/tpl
+install html/*.php $RPM_BUILD_ROOT%{_datadir}/pbx
 
-install util/pbx.cron $RPM_BUILD_ROOT/%{_examplesdir}/%{name}-%{version}/
-install sql/{user,pbx}.sql $RPM_BUILD_ROOT/%{_examplesdir}/%{name}-%{version}/
-
-install workerhome/capture.log			$RPM_BUILD_ROOT/var/lib/%{name}/
-install workerhome/fix-rights.sh		$RPM_BUILD_ROOT/var/lib/%{name}/
-install workerhome/log/execution.log	$RPM_BUILD_ROOT/var/lib/%{name}/log/
-install workerhome/log/pbxerr.log		$RPM_BUILD_ROOT/var/lib/%{name}/log/
-install workerhome/run/pbx.pid			$RPM_BUILD_ROOT/var/lib/%{name}/run/
-install workerhome/scripts/processfile	$RPM_BUILD_ROOT/var/lib/%{name}/scripts/
-install workerhome/scripts/sed_script	$RPM_BUILD_ROOT/var/lib/%{name}/scripts/
+install util/pbx.cron $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install sql/{user,pbx}.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+install workerhome/capture.log			$RPM_BUILD_ROOT/var/lib/%{name}
+install workerhome/fix-rights.sh		$RPM_BUILD_ROOT/var/lib/%{name}
+install workerhome/log/execution.log	$RPM_BUILD_ROOT/var/lib/%{name}/log
+install workerhome/log/pbxerr.log		$RPM_BUILD_ROOT/var/lib/%{name}/log
+install workerhome/run/pbx.pid			$RPM_BUILD_ROOT/var/lib/%{name}/run
+install workerhome/scripts/processfile	$RPM_BUILD_ROOT/var/lib/%{name}/scripts
+install workerhome/scripts/sed_script	$RPM_BUILD_ROOT/var/lib/%{name}/scripts
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
-%doc docs/*
+%doc ChangeLog README TODO docs/*
 
 %{_datadir}/%{name}
 
@@ -85,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
 %{_examplesdir}/%{name}-%{version}
-/var/lib/%{name}/
+/var/lib/%{name}
 
 %files php
 %defattr(644,root,root,755)