summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-12-01 16:20:37 +0100
committerRemi Collet <fedora@famillecollet.com>2016-12-01 16:20:37 +0100
commit7cdbf4fa5083d831122373c83cf43392eb44710a (patch)
tree0876cff2e0b45b42032ddce5c1384e406d5893e3
parent01f543c87c84f6334ed9bcb401356893a03fa832 (diff)
php-punic: sync with Fedora
-rw-r--r--php-punic.spec50
1 files changed, 23 insertions, 27 deletions
diff --git a/php-punic.spec b/php-punic.spec
index 3c1c1af..b30a3b7 100644
--- a/php-punic.spec
+++ b/php-punic.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-punic
#
-# Copyright (c) 2015 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -28,7 +28,7 @@
Name: php-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 2%{?github_release}%{?dist}
Summary: PHP-Unicode CLDR
Group: Development/Libraries
@@ -50,7 +50,7 @@ BuildRequires: python
BuildRequires: %{_bindir}/phpunit
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-## phpcompatinfo (computed from version 1.6.3)
+## phpcompatinfo (computed from version 1.6.4)
BuildRequires: php-date
BuildRequires: php-iconv
BuildRequires: php-intl
@@ -59,12 +59,12 @@ BuildRequires: php-mbstring
BuildRequires: php-pcre
BuildRequires: php-spl
## Autoloader
-BuildRequires: php-composer(symfony/class-loader)
+BuildRequires: php-composer(fedora/autoloader)
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 1.6.3)
+# phpcompatinfo (computed from version 1.6.4)
Requires: php-date
Requires: php-iconv
Requires: php-intl
@@ -72,8 +72,7 @@ Requires: php-json
Requires: php-mbstring
Requires: php-pcre
# Autoloader
-Requires: php-composer(symfony/class-loader)
-Requires: php-spl
+Requires: php-composer(fedora/autoloader)
# Standard "php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}" naming
Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
@@ -88,42 +87,29 @@ variables like numbers, dates, units, lists, ...
For full API reference see the APIs reference [1].
+Autoloader: %{phpdir}/Punic/autoload.php
+
[1] http://punic.github.io/docs
%prep
%setup -qn %{github_name}-%{github_commit}
+
+%build
: Create autoloader
cat <<'AUTOLOAD' | tee code/autoload.php
<?php
/**
* Autoloader for %{name} and its' dependencies
- *
- * Created by %{name}-%{version}-%{release}
- *
- * @return \Symfony\Component\ClassLoader\ClassLoader
+ * (created by %{name}-%{version}-%{release}).
*/
+require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
- if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
- require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php';
- }
-
- $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
- $fedoraClassLoader->register();
-}
-
-$fedoraClassLoader->addPrefix('Punic\\', dirname(__DIR__));
-
-return $fedoraClassLoader;
+\Fedora\Autoloader\Autoload::addPsr4('Punic\\', __DIR__);
AUTOLOAD
-%build
-# Empty build section, nothing to build
-
-
%install
rm -rf %{buildroot}
@@ -141,6 +127,10 @@ ln -s \
%check
%if %{with_tests}
+: Skip tests known to fail
+sed 's/function testDescribeInterval/function SKIP_testDescribeInterval/' \
+ -i tests/Calendar/CalendarTest.php
+
%{_bindir}/phpunit \
-d memory_limit=-1 \
--bootstrap %{buildroot}%{phpdir}/Punic/autoload.php \
@@ -166,6 +156,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Nov 26 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.6.4-1
+- Update to 1.6.4 (RHBZ #1397224)
+- Switch autoloader from php-composer(symfony/class-loader) to
+ php-composer(fedora/autoloader)
+- Fix FTBFS
+
* Tue Nov 22 2016 Remi Collet <remi@remirepo.net> - 1.6.4-1
- update to 1.6.4