SPECS: php-eaccelerator.spec - macro cleanup; rel 4

[glen]

Author: glen                         Date: Thu Dec 18 19:04:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- macro cleanup; rel 4

---- Files affected:
SPECS:
   php-eaccelerator.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: SPECS/php-eaccelerator.spec
diff -u SPECS/php-eaccelerator.spec:1.71 SPECS/php-eaccelerator.spec:1.72
--- SPECS/php-eaccelerator.spec:1.71	Tue Dec  9 09:57:18 2008
+++ SPECS/php-eaccelerator.spec	Thu Dec 18 20:04:39 2008
@@ -1,18 +1,17 @@
 # $Revision$, $Date$
 #
-%define		_name		eaccelerator
-%define		_pkgname	eaccelerator
+%define		pkgname		eaccelerator
 Summary:	eAccelerator module for PHP
 Summary(pl.UTF-8):	Moduł eAccelerator dla PHP
-Name:		php-%{_name}
+Name:		php-%{pkgname}
 Version:	0.9.5.3
-Release:	3
+Release:	4
 Epoch:		0
 License:	GPL
 Group:		Libraries
-Source0:	http://bart.eaccelerator.net/source/%{version}/%{_pkgname}-%{version}.tar.bz2
+Source0:	http://bart.eaccelerator.net/source/%{version}/%{pkgname}-%{version}.tar.bz2
 # Source0-md5:	caf797223739516882f870342f74b935
-Source1:	%{_name}.ini
+Source1:	%{pkgname}.ini
 Patch0:		%{name}-no-short-open-tag.patch
 URL:		http://eaccelerator.net/
 BuildRequires:	php-devel >= 3:5.0.0
@@ -25,7 +24,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_webapps	/etc/webapps
-%define		_webapp		%{_name}
+%define		_webapp		%{pkgname}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 %define		_appdir		%{_datadir}/%{_webapp}
 
@@ -67,7 +66,7 @@
 Więcej informacji można znaleźć pod %{url}.
 
 %prep
-%setup -q -n %{_pkgname}-%{version}
+%setup -q -n %{pkgname}-%{version}
 %patch0 -p1
 
 cat > apache.conf <<EOF
@@ -97,18 +96,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{php_extensiondir},%{_bindir},%{php_sysconfdir}/conf.d,/var/cache/%{_name},%{_sysconfdir},%{_appdir},/etc/tmpwatch}
+install -d $RPM_BUILD_ROOT{%{php_extensiondir},%{_bindir},%{php_sysconfdir}/conf.d,/var/cache/%{pkgname},%{_sysconfdir},%{_appdir},/etc/tmpwatch}
 
 install modules/eaccelerator.so $RPM_BUILD_ROOT%{php_extensiondir}
 install eLoader/modules/eloader.so $RPM_BUILD_ROOT%{php_extensiondir}
 install encoder.php $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_name}.ini
+install %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{pkgname}.ini
 
 cp -a {PHP_Highlight,control,dasm}.php $RPM_BUILD_ROOT%{_appdir}
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
-echo "/var/cache/%{_name} 720" > $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
+echo "/var/cache/%{pkgname} 720" > $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,18 +135,18 @@
 %preun
 if [ "$1" = 0 ]; then
 	# remove last pieces of cache
-	rm -rf /var/cache/%{_name}/*
+	rm -rf /var/cache/%{pkgname}/*
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README README.eLoader bugreport.php doc/php
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_name}.ini
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{pkgname}.ini
 %config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/%{name}.conf
 %attr(755,root,root) %{php_extensiondir}/eaccelerator.so
 %attr(755,root,root) %{php_extensiondir}/eloader.so
 %attr(755,root,root) %{_bindir}/encoder.php
-%attr(770,root,http) /var/cache/%{_name}
+%attr(770,root,http) /var/cache/%{pkgname}
 
 %files webinterface
 %defattr(644,root,root,755)
@@ -165,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2008/12/18 19:04:39  glen
+- macro cleanup; rel 4
+
 Revision 1.71  2008/12/09 08:57:18  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-eaccelerator.spec?r1=1.71&r2=1.72&f=u