rpms/php-pear-PHP-CompatInfo/F-12 PHP_CompatInfo-path.patch, NONE, 1.1 php-pear-PHP-CompatInfo.spec, 1.13, 1.14 sources, 1.10, 1.11
Remi Collet
remi at fedoraproject.org
Sun Jan 24 10:38:08 UTC 2010
- Previous message: rpms/php-pear-PHP-CompatInfo/devel PHP_CompatInfo-path.patch, NONE, 1.1 php-pear-PHP-CompatInfo.spec, 1.14, 1.15
- Next message: rpms/mythes-ro/devel .cvsignore, 1.2, 1.3 mythes-ro.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23925
Modified Files:
php-pear-PHP-CompatInfo.spec sources
Added Files:
PHP_CompatInfo-path.patch
Log Message:
update to 1.9.0
PHP_CompatInfo-path.patch:
php-pear-PHP-CompatInfo.xml | 2 +-
scripts/configure.php | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
--- NEW FILE PHP_CompatInfo-path.patch ---
diff -up PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml.scriptspath PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml
--- PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml.scriptspath 2009-01-19 11:09:40.000000000 +0100
+++ PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml 2010-01-24 11:05:36.000000000 +0100
@@ -220,7 +220,7 @@ which shows which functions require whic
<tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
<tasks:replace from="@bin_dir@" to="bin_dir" type="pear-config" />
</file>
- <file baseinstalldir="" md5sum="0a0b44b17894b65a27bd39bb68dccf22" name="scripts/configure.php" role="script">
+ <file baseinstalldir="" md5sum="cb4a1b3b216d72534ff66c2b7aaa226d" name="scripts/configure.php" role="script">
<tasks:unixeol />
<tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
<tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
diff -up PHP_CompatInfo-1.9.0/scripts/configure.php.scriptspath PHP_CompatInfo-1.9.0/scripts/configure.php
--- PHP_CompatInfo-1.9.0/scripts/configure.php.scriptspath 2009-01-19 11:09:38.000000000 +0100
+++ PHP_CompatInfo-1.9.0/scripts/configure.php 2010-01-24 11:04:06.000000000 +0100
@@ -150,7 +150,7 @@ if ($args->isDefined('x')) {
exit(1);
}
} else {
- include_once dirname(__FILE__) . $ds . 'scripts' . $ds . 'exceptions.conf.php';
+ include_once 'PHP/CompatInfo/scripts/exceptions.conf.php';
}
$const_glob_list = array();
@@ -158,7 +158,11 @@ $class_glob_list = array();
$func_glob_list = array();
// PHP Core constants
-$extName = 'internal';
+if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+ $extName = 'internal';
+} else {
+ $extName = 'Core';
+}
$extConstants = get_defined_constants(true);
$const_glob_list[] = $extName;
@@ -561,4 +565,4 @@ file_put_contents($target_directory . 'f
". $globals .
" );
?>");
-?>
\ Pas de fin de ligne à la fin du fichier.
+?>
Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/F-12/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- php-pear-PHP-CompatInfo.spec 26 Jul 2009 18:26:28 -0000 1.13
+++ php-pear-PHP-CompatInfo.spec 24 Jan 2010 10:38:08 -0000 1.14
@@ -4,8 +4,8 @@
##define beta RC2
Name: php-pear-PHP-CompatInfo
-Version: 1.8.1
-Release: 3%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
Summary: Find out version and extensions required for a piece of code to run
Summary(fr): Trouver version et extensions nécessaires à l'exécution d'un code
@@ -14,21 +14,30 @@ License: BSD
URL: http://pear.php.net/package/PHP_CompatInfo
Source0: http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
Source2: xml2changelog
+
+Patch0: PHP_CompatInfo-path.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear(PEAR) >= 1.5.4
Requires: php-pear(PEAR) >= 1.5.4
-Requires: php-pear(Console_Table) >= 1.1.1 php-pear(Console_Getargs) >= 1.3.3
-Requires: php-pear(File_Find) >= 1.3.0 php-pear(Event_Dispatcher) >= 1.0.0
+Requires: php-pear(Console_Table) >= 1.1.1
+Requires: php-pear(Console_Getargs) >= 1.3.3
+Requires: php-pear(File_Find) >= 1.3.0
+Requires: php-pear(Event_Dispatcher) >= 1.0.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
# Optional dependencies
-Requires: php-pear(XML_Util) >= 1.1.4 php-pear(XML_Beautifier) >= 1.1
+Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.2.0
+Requires: php-pear(XML_Util) >= 1.1.4
+Requires: php-pear(XML_Beautifier) >= 1.1
Requires: php-pear(Console_ProgressBar) >= 0.5.2
-Requires: php-pear(Var_Dump) >= 1.0.3 php-pear(HTML_Table) >= 1.8.2
+Requires: php-pear(Var_Dump) >= 1.0.3
+Requires: php-pear(HTML_Table) >= 1.8.2
+
%description
PHP_CompatInfo will parse a file/folder/script/array to find out the
@@ -42,10 +51,13 @@ trouver la version minimum et les extens
Produit des rapports détaillés montrant quelles fonctions utilisées imposent
une version. Un script permet la production de rapport en ligne de commande.
+
%prep
%setup -q -c
%{_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
+
+%patch0 -p0 -b .scriptspath
%build
@@ -56,17 +68,18 @@ cd %{pear_name}-%{version}%{?beta}
%install
rm -rf $RPM_BUILD_ROOT docdir
pushd %{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}
-# Fix CR/LF
-sed -i -e 's/\r//' $RPM_BUILD_ROOT%{_bindir}/pci
+# Move scripts as /usr/bin/scripts seems a really bad idea (requires fixed in patch0)
+mv $RPM_BUILD_ROOT%{_bindir}/scripts $RPM_BUILD_ROOT%{pear_phpdir}/PHP/CompatInfo/scripts
+chmod -x $RPM_BUILD_ROOT%{pear_phpdir}/PHP/CompatInfo/scripts/*
popd
@@ -82,7 +95,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
@@ -94,24 +107,30 @@ fi
%check
# yum install php-pear-PHP-CompatInfo
-# yum install php-pear-PHPUnit # (tested with 3.2.19)
+# yum install php-pear-PHPUnit # (tested with 3.4.9)
# cd /usr/share/pear/test/PHP_CompatInfo/tests
-# php AllTests.php
-# should display : Tests: 50, Failures: 4.
-# Lot of problems with the return result order, not really error... :(
+# phpunit AllTests
+# OK, but incomplete or skipped tests!
+# Tests: 74, Assertions: 69, Skipped: 18.
%files
%defattr(-,root,root,-)
%doc CHANGELOG docdir/docs/*
%{pear_phpdir}/PHP
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{_bindir}/pci
+%{_bindir}/pciconf
%{pear_testdir}/%{pear_name}
%{pear_datadir}/%{pear_name}
%changelog
+* Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.0-1
+- update to 1.9.0
+- add patch for php 5.3.0 and to redirect scripts (/usr/bin/scripts seems a bad idea)
+- rename PHP_CompatInfo.xml to php-pear-PHP-CompatInfo.xml
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 30 Sep 2008 19:54:53 -0000 1.10
+++ sources 24 Jan 2010 10:38:08 -0000 1.11
@@ -1 +1 @@
-a093729a4d205ebc8bf00bcee01de311 PHP_CompatInfo-1.8.1.tgz
+5396bcc77fc7650a73cb0d76b812b7c3 PHP_CompatInfo-1.9.0.tgz
- Previous message: rpms/php-pear-PHP-CompatInfo/devel PHP_CompatInfo-path.patch, NONE, 1.1 php-pear-PHP-CompatInfo.spec, 1.14, 1.15
- Next message: rpms/mythes-ro/devel .cvsignore, 1.2, 1.3 mythes-ro.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list