rpms/php-pear-Net-DIME/EL-6 php-pear-Net-DIME.spec,1.8,1.9

[Remi Collet]

Author: remi

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

Modified Files:
	php-pear-Net-DIME.spec 
Log Message:
spec cleanup


Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-DIME/EL-6/php-pear-Net-DIME.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-Net-DIME.spec	26 Jul 2009 18:21:43 -0000	1.8
+++ php-pear-Net-DIME.spec	22 May 2010 07:41:34 -0000	1.9
@@ -1,11 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_DIME
+%global pear_name Net_DIME
 
-# define beta RC1
+#global beta RC1
 
 Name:           php-pear-Net-DIME
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -35,7 +35,7 @@ Optimization Mechanism (MTOM) specificat
 %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}
 
@@ -48,14 +48,14 @@ 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
 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
@@ -64,7 +64,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
@@ -76,12 +76,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
 %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat May 22 2010 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-4
+- spec cleanup
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild