rpms/php-pear-Net-FTP/devel php-pear-Net-FTP.spec,1.8,1.9

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Net-FTP/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4310

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


Index: php-pear-Net-FTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Net-FTP/devel/php-pear-Net-FTP.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-Net-FTP.spec	26 Jul 2009 18:22:15 -0000	1.8
+++ php-pear-Net-FTP.spec	22 May 2010 07:52:43 -0000	1.9
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_FTP
+%global pear_name Net_FTP
 
 Name:           php-pear-Net-FTP
 Version:        1.3.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides an OO interface to the PHP FTP functions plus some additions
 
 Group:          Development/Libraries
@@ -36,7 +36,7 @@ pattern to allow for example the view of
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 
 cd %{pear_name}-%{version}
 
@@ -49,7 +49,7 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
@@ -63,7 +63,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}
 
 # Patch applied here (don't break checksum control during install)
 cd $RPM_BUILD_ROOT%{pear_testdir}/Net_FTP
@@ -77,7 +77,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
@@ -90,7 +90,7 @@ fi
 %defattr(-,root,root,-)
 %doc docdir/example %{pear_name}-%{version}/CHANGELOG
 
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
 %{pear_testdir}/Net_FTP
 %{pear_datadir}/Net_FTP
@@ -107,6 +107,10 @@ fi
 
 
 %changelog
+* Sat May 22 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.7-2
+- spec cleanup
+- rename Net_FTP.xml to php-pear-Net-FTP.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild