SPECS: freepbx.spec - fix re-entrancy; cosmetics

[glen]

Author: glen                         Date: Wed May 31 01:45:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix re-entrancy; cosmetics

---- Files affected:
SPECS:
   freepbx.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/freepbx.spec
diff -u SPECS/freepbx.spec:1.6 SPECS/freepbx.spec:1.7
--- SPECS/freepbx.spec:1.6	Wed May 31 02:36:39 2006
+++ SPECS/freepbx.spec	Wed May 31 03:45:38 2006
@@ -1,8 +1,7 @@
 # $Revision$, $Date$
-#TODO
+# TODO
 # - remowe jpgraph, add patch
 # - pl translations
-
 Summary:	FreePBX - Asterisk Management Portal (AMP)
 Summary(pl):	FreePBX - interfejs WWW do Asteriska
 Name:		freepbx
@@ -77,17 +76,15 @@
 %setup -q
 %patch0 -p1
 find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
+rm -dfr htdocs/admin/cdr/jpgraph_lib
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{cgi-bin,agi-bin,astetc,bin,htdocs,htdocs_panel,mohmp3,sbin,sounds}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-cd ./amp_conf
-rm -dfr htdocs/admin/cdr/jpgraph_lib
+cd amp_conf
 cp -R htdocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
 install cgi-bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cgi-bin
 install agi-bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/agi-bin
@@ -144,13 +141,15 @@
 %files db-mysql
 %defattr(644,root,root,755)
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/05/31 01:45:38  glen
+- fix re-entrancy; cosmetics
+
 Revision 1.6  2006/05/31 00:36:39  wolvverine
 - NFY, add jpgraph patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/freepbx.spec?r1=1.6&r2=1.7&f=u