rpms/php-pear-PHP-Compat/EL-6 php-pear-PHP-Compat.spec,1.4,1.5

Remi Collet remi at fedoraproject.org
Sat May 22 08:51:06 UTC 2010


Author: remi

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

Modified Files:
	php-pear-PHP-Compat.spec 
Log Message:
spec cleanup


Index: php-pear-PHP-Compat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-Compat/EL-6/php-pear-PHP-Compat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-PHP-Compat.spec	26 Jul 2009 18:26:12 -0000	1.4
+++ php-pear-PHP-Compat.spec	22 May 2010 08:51:06 -0000	1.5
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name PHP_Compat
+%global pear_name PHP_Compat
 
 Name:           php-pear-PHP-Compat
 Version:        1.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides missing functionality for older versions of PHP
 Summary(fr):    Fournit les fonctionnalités manquantes aux anciennes versions de PHP
 
@@ -34,7 +34,7 @@ versions de PHP. Il s'agit de fonctions 
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
 cd %{pear_name}-%{version}
@@ -46,7 +46,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -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}
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -65,7 +65,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,11 +76,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc LICENSE CHANGELOG
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/PHP
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Sat May 22 2010 Remi Collet <Fedora at FamilleCollet.com> 1.5.0-5
+- spec cleanup
+- rename PHP_Compat.xml to php-pear-PHP-Compat.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list