rpms/php-pear-Console-ProgressBar/EL-6 php-pear-Console-ProgressBar.spec, 1.4, 1.5

[Remi Collet]

Author: remi

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

Modified Files:
	php-pear-Console-ProgressBar.spec 
Log Message:
spec cleanup


Index: php-pear-Console-ProgressBar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Console-ProgressBar/EL-6/php-pear-Console-ProgressBar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Console-ProgressBar.spec	26 Jul 2009 18:10:57 -0000	1.4
+++ php-pear-Console-ProgressBar.spec	21 May 2010 17:40:43 -0000	1.5
@@ -1,10 +1,10 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Console_ProgressBar
+%global pear_name Console_ProgressBar
+%global beta beta
 
-%define beta beta
 Name:           php-pear-Console-ProgressBar
 Version:        0.5.2
-Release:        0.5.beta%{?dist}
+Release:        0.6.beta%{?dist}
 Summary:        This class provides you with an easy-to-use interface to progress bars
 
 Group:          Development/Libraries
@@ -29,7 +29,7 @@ time.
 %prep
 %setup -q -c
 # Ok, package description is v2
-mv package.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}%{beta}/%{name}.xml
 cd %{pear_name}-%{version}%{beta}
 
 
@@ -41,7 +41,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
 
 # Move documentation
 mkdir -p docdir
@@ -54,7 +54,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
@@ -63,7 +63,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
@@ -75,12 +75,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc docdir/*
-
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Console/*
 
 
 %changelog
+* Fri May 21 2010 Remi Collet <Fedora at FamilleCollet.com> 0.5.2-0.6.beta
+- spec cleanup
+- rename Console_ProgressBar.xml to php-pear-Console-ProgressBar.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-0.5.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild