[php-symfony2-Translation] Updated to upstream version 2.1.2 + added tests
Shawn Iwinski
siwinski at fedoraproject.org
Wed Oct 24 01:28:29 UTC 2012
commit 1c92d5ce41042f44c5368296a83d58cf88b61d78
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sun Sep 23 20:29:42 2012 -0400
Updated to upstream version 2.1.2 + added tests
.gitignore | 1 +
php-symfony2-Translation-tests-bootstrap.patch | 24 +++++++++
php-symfony2-Translation.spec | 62 +++++++++++++++++++++--
sources | 1 +
4 files changed, 82 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d92d29..96b000d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/Translation-2.0.15.tgz
/Translation-2.0.16.tgz
/Translation-2.0.17.tgz
+/Translation-2.1.2.tgz
diff --git a/php-symfony2-Translation-tests-bootstrap.patch b/php-symfony2-Translation-tests-bootstrap.patch
new file mode 100644
index 0000000..1957cb9
--- /dev/null
+++ b/php-symfony2-Translation-tests-bootstrap.patch
@@ -0,0 +1,24 @@
+--- Symfony/Component/Translation/Tests/bootstrap.php 2012-09-20 03:42:19.000000000 -0400
++++ Symfony/Component/Translation/Tests/bootstrap.php 2012-10-23 21:19:35.201578730 -0400
+@@ -10,9 +10,18 @@
+ */
+
+ spl_autoload_register(function ($class) {
+- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Translation')) {
+- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Translation')).'.php')) {
+- require_once $file;
++ if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) {
++ $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php';
++ if (file_exists(__DIR__.'/../..'.$file)) {
++ // Load from source tree
++ require_once __DIR__.'/../..'.$file;
++ } else {
++ try {
++ // Try loading from incude path
++ require_once 'Symfony/Component'.$file;
++ } catch (Exception $e) {
++ // Fail silently so class not found fatal error still raised
++ }
+ }
+ }
+ });
diff --git a/php-symfony2-Translation.spec b/php-symfony2-Translation.spec
index 62f3511..b20e526 100644
--- a/php-symfony2-Translation.spec
+++ b/php-symfony2-Translation.spec
@@ -2,9 +2,10 @@
%global pear_channel pear.symfony.com
%global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
+%global php_min_ver 5.3.3
Name: php-symfony2-Translation
-Version: 2.0.17
+Version: 2.1.2
Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
@@ -12,34 +13,67 @@ Group: Development/Libraries
License: MIT
URL: http://symfony.com/components
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+Patch0: %{name}-tests-bootstrap.patch
BuildArch: noarch
BuildRequires: php-pear(PEAR)
BuildRequires: php-channel(%{pear_channel})
-
-Requires: php-common >= 5.3.2
+# Test requires
+BuildRequires: php-common >= %{php_min_ver}
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires: php-pear(%{pear_channel}/Config) >= 2.1.0
+BuildRequires: php-pear(%{pear_channel}/Yaml) >= 2.1.0
+# Test requires: phpci
+BuildRequires: php-dom
+BuildRequires: php-intl
+BuildRequires: php-libxml
+BuildRequires: php-mbstring
+BuildRequires: php-pcre
+BuildRequires: php-simplexml
+BuildRequires: php-spl
+
+Requires: php-common >= 5.3.3
Requires: php-pear(PEAR)
Requires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
# phpci requires
Requires: php-dom
+Requires: php-intl
Requires: php-libxml
+Requires: php-mbstring
Requires: php-pcre
Requires: php-simplexml
Requires: php-spl
# Optional requires
-Requires: php-pear(%{pear_channel}/Config) = %{version}
-Requires: php-pear(%{pear_channel}/Yaml) = %{version}
+Requires: php-pear(%{pear_channel}/Config) >= 2.1.0
+Requires: php-pear(%{pear_channel}/Yaml) >= 2.1.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
%description
-%{summary}.
+Translation provides tools for loading translation files and generating
+translated strings from these including support for pluralization.
%prep
%setup -q -c
+
+# Patches
+cd %{pear_name}-%{version}
+%patch0 -p0
+cd ..
+
+# Modify PEAR package.xml file:
+# - Remove .gitignore file
+# - Change role from "php" to "doc" for CHANGELOG.md file
+# - Change role from "php" to "test" for all test files
+sed -e '/.gitignore/d' \
+ -e '/CHANGELOG.md/s/role="php"/role="doc"/' \
+ -e '/phpunit.xml.dist/s/role="php"/role="test"/' \
+ -e '/Tests/s/role="php"/role="test"/' \
+ -i package.xml
+
# package.xml is version 2.0
mv package.xml %{pear_name}-%{version}/%{name}.xml
@@ -60,6 +94,11 @@ mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+%check
+cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
+%{_bindir}/phpunit
+
+
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -76,9 +115,20 @@ fi
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Symfony/Component/%{pear_name}
+%{pear_testdir}/%{pear_name}
%changelog
+* Tue Oct 23 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-1
+- Updated to upstream version 2.1.2
+- Updated description
+- PHP minimum version 5.3.3 instead of 5.3.2
+- Added php-intl and php-mbstring requires
+- Require other components ">= 2.1.0" instead of "= %%{version}"
+- Added PEAR package.xml modifications
+- Added patch for tests' bootstrap.php
+- Added tests (%%check)
+
* Sat Sep 15 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.17-1
- Updated to upstream version 2.0.17
- Added php-dom and php-spl requires
diff --git a/sources b/sources
index 73404a6..6542735 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
5e92cc0d55511f176d46e75484bef30f Translation-2.0.15.tgz
5f40043f9c1536603cb072b6c2b93581 Translation-2.0.16.tgz
4526c2ff4d3836fee81abeaebfdaf886 Translation-2.0.17.tgz
+3791ed0b9c3c8584ce35e506e7b8b00f Translation-2.1.2.tgz
More information about the scm-commits
mailing list