SPECS: asterisk-stat.spec - cosmetics: unify macros usage

glen glen at pld-linux.org
Sun May 28 01:26:23 CEST 2006


Author: glen                         Date: Sat May 27 23:26:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics: unify macros usage

---- Files affected:
SPECS:
   asterisk-stat.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/asterisk-stat.spec
diff -u SPECS/asterisk-stat.spec:1.12 SPECS/asterisk-stat.spec:1.13
--- SPECS/asterisk-stat.spec:1.12	Sun May 28 01:25:00 2006
+++ SPECS/asterisk-stat.spec	Sun May 28 01:26:18 2006
@@ -31,7 +31,7 @@
 
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
-%define		_webappdir	%{_webapps}/%{_webapp}
+%define		_sysconfdir	%{_webapps}/%{_webapp}
 %define		_appdir		%{_datadir}/%{_webapp}
 
 %description
@@ -85,12 +85,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir},%{_webappdir},%{_sysconfdir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}
 cp -aRf * $RPM_BUILD_ROOT%{_appdir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_webappdir}/config.php
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,11 +110,11 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG.txt
-%dir %attr(750,root,http) %{_webappdir}
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php
-%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
-%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
-%{_datadir}/%{name}
+%dir %attr(750,root,http) %{_sysconfdir}
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%{_appdir}
 
 %files db-mysql
 %defattr(644,root,root,755)
@@ -128,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/05/27 23:26:18  glen
+- cosmetics: unify macros usage
+
 Revision 1.12  2006/05/27 23:25:00  glen
 - alter source in %prep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/asterisk-stat.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list