rpms/php-pear-Cache/EL-6 php-pear-Cache.spec,1.5,1.6

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Cache/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21664

Modified Files:
	php-pear-Cache.spec 
Log Message:
spec cleanup


Index: php-pear-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Cache/EL-6/php-pear-Cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Cache.spec	26 Jul 2009 18:09:33 -0000	1.5
+++ php-pear-Cache.spec	14 May 2010 06:10:49 -0000	1.6
@@ -1,5 +1,5 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Cache
+%global pear_name Cache
 
 ##define beta RC4
 
@@ -7,7 +7,7 @@ Name:           php-pear-Cache
 Version:        1.5.5
 
 %if %{?beta:0}%{!?beta:1}
-Release:        3%{?dist}
+Release:        4%{?dist}
 %else
 Release:        0.2.%{beta}%{?dist}
 %endif
@@ -38,7 +38,7 @@ between applications.
 %setup -q -c
 # package.xml is V2
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}%{?beta}/%{name}.xml
 
 cd %{pear_name}-%{version}%{?beta}
 
@@ -51,7 +51,7 @@ cd %{pear_name}-%{version}%{?beta}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}%{?beta}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -80,14 +80,16 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
-
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Cache.php
 %{pear_phpdir}/Cache
 %{pear_datadir}/Cache
 
 
 %changelog
+* Fri May 14 2010 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-4
+- spec cleanup
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild