The package rpms/php-twig.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/php-twig.git/commit/?id=4073edf9f989....
Change: -%ifarch ppc64
Thanks.
Full change: ============
commit 4073edf9f9893281830907c80225efa5886a3ec8 Author: Remi Collet remi@fedoraproject.org Date: Tue Aug 27 13:35:32 2019 +0200
update to 1.42.3 use symfony/debug v3 use phpunit v7 raise dependency on PHP 5.5 drop support of the C extension
diff --git a/.gitignore b/.gitignore index 2d464b1..c7420a3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ clog /php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz /php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz /php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz +/php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz diff --git a/composer.json b/composer.json index 2f10465..9807aa7 100644 --- a/composer.json +++ b/composer.json @@ -24,12 +24,12 @@ } ], "require": { - "php": ">=5.4.0", + "php": ">=5.5.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0", - "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^4.4@dev|^5.0", + "symfony/debug": "^3.4|^4.2", "psr/container": "^1.0" }, "autoload": { @@ -40,6 +40,11 @@ "Twig\" : "src/" } }, + "autoload-dev": { + "psr-4" : { + "Twig\Tests\" : "tests" + } + }, "extra": { "branch-alias": { "dev-master": "1.42-dev" diff --git a/php-twig.spec b/php-twig.spec index 19bb0a9..81d53df 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,31 +12,15 @@
%global github_owner twigphp %global github_name Twig -%global github_version 1.42.2 -%global github_commit 21707d6ebd05476854805e4f91b836531941bcd4 - -%if 0%{?fedora} < 25 && 0%{?rhel} < 8 -%global with_ext 1 -%else -%global with_ext 0 -BuildArch: noarch -%endif +%global github_version 1.42.3 +%global github_commit 201baee843e0ffe8b0b956f336dd42b2a92fae4e
# Lib %global composer_vendor twig %global composer_project twig
-# Ext -%global ext_name twig -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%if "%{php_version}" < "5.6" -%global ini_name %{ext_name}.ini -%else -%global ini_name 40-%{ext_name}.ini -%endif - -# "php": ">=5.4.0" -%global php_min_ver 5.4 +# "php": ">=5.5.0" +%global php_min_ver 5.5
# Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -46,22 +30,23 @@ BuildArch: noarch
Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP
License: BSD URL: http://twig.sensiolabs.org Source0: https://github.com/%%7Bgithub_owner%7D/%%7Bgithub_name%7D/archive/%%7Bgithub...
+BuildArch: noarch BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with_tests} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: phpunit7 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(symfony/debug) >= 2.7 with php-composer(symfony/debug) < 3) +BuildRequires: (php-composer(symfony/debug) >= 3.4 with php-composer(symfony/debug) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) %else -BuildRequires: php-symfony-debug >= 2.7 +BuildRequires: php-symfony3-debug >= 3.4 BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 %endif @@ -96,11 +81,6 @@ Requires: php-pcre Requires: php-reflection Requires: php-simplexml Requires: php-spl -# Ext -%if %{with_ext} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%endif # Autoloader Requires: php-composer(fedora/autoloader)
@@ -112,16 +92,6 @@ Obsoletes: php-twig-Twig < %{version}-%{release} Provides: php-twig-Twig = %{version}-%{release} ## PEAR Provides: php-pear(pear.twig-project.org/Twig) = %{version} -# Ext -%if %{with_ext} -## Rename -Obsoletes: php-twig-ctwig < %{version}-%{release} -Provides: php-twig-ctwig = %{version}-%{release} -Provides: php-twig-ctwig%{?_isa} = %{version}-%{release} -## PECL -Provides: php-pecl(pear.twig-project.org/CTwig) = %{version} -Provides: php-pecl(pear.twig-project.org/CTwig)%{?_isa} = %{version} -%endif
# This pkg was the only one in this channel so the channel is no longer needed Obsoletes: php-channel-twig @@ -147,21 +117,6 @@ Autoloader: %{phpdir}/Twig/autoload.php %prep %setup -qn %{github_name}-%{github_commit}
-%if %{with_ext} -: Ext -- NTS -mv ext/%{ext_name} ext/NTS -%if %{with_zts} -: Ext -- ZTS -cp -pr ext/NTS ext/ZTS -%endif - -: Ext -- Create configuration file -cat > %{ini_name} << 'INI' -; Enable %{ext_name} extension module -extension=%{ext_name}.so -INI -%endif - : Move the PSR-4 compat library mv src lib/Twig/psr4
@@ -170,23 +125,7 @@ phpab --template fedora --output lib/Twig/autoload.php lib
%build -%if %{with_ext} -: Ext -- NTS -pushd ext/NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} -popd - -: Ext -- ZTS -%if %{with_zts} -pushd ext/ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -popd -%endif -%endif +: nothing
%install @@ -194,17 +133,6 @@ popd mkdir -p %{buildroot}%{phpdir} cp -rp lib/* %{buildroot}%{phpdir}/
-%if %{with_ext} -: Ext -- NTS -make -C ext/NTS install INSTALL_ROOT=%{buildroot} -install -D -m 0644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} -: Ext -- ZTS -%if %{with_zts} -make -C ext/ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 0644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif -%endif -
%check : Library version check @@ -214,62 +142,32 @@ install -D -m 0644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %{_bindir}/php -r 'require_once "%{buildroot}%{phpdir}/Twig/autoload.php"; exit(version_compare("%{version}", Twig\Environment::VERSION, "=") ? 0 : 1);'
-%if %{with_ext} -: Extension version check -EXT_VERSION=`grep PHP_TWIG_VERSION ext/NTS/php_twig.h | awk '{print $3}' | sed 's/"//g'` \ - %{_bindir}/php -r 'exit(version_compare("%{version}", getenv("EXT_VERSION"), "=") ? 0 : 1);' - -: Extension NTS minimal load test -%{_bindir}/php --no-php-ini \ - --define extension=ext/NTS/modules/%{ext_name}.so \ - --modules | grep %{ext_name} - -%if %{with_zts} -: Extension ZTS minimal load test -%{__ztsphp} --no-php-ini \ - --define extension=ext/ZTS/modules/%{ext_name}.so \ - --modules | grep %{ext_name} -%endif -%endif - %if %{with_tests} : Generate autoloader mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{phpdir}/Twig/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('Twig\Tests\', dirname(__DIR__) . '/tests'); \Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/Symfony/Component/Debug/autoload.php', + '%{phpdir}/Symfony3/Component/Debug/autoload.php', '%{phpdir}/Psr/Container/autoload.php', )); EOF
-: Disable listener from symfony/phpunit-bridge ~3.2 +: Disable listener from symfony/phpunit-bridge ^4.4@dev sed -e '/listener/d' phpunit.xml.dist > phpunit.xml
-: Skip tests known to fail -sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \ - -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAttributeWithTemplateAsObject/' \ - -i test/Twig/Tests/TemplateTest.php -%ifarch ppc64 -sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttributeWithTemplateAsObject/' \ - -i test/Twig/Tests/TemplateTest.php -%endif - : Test suite without extension ret=0 for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 + $cmd %{_bindir}/phpunit7 \ + --filter '^((?!(testGetAttributeExceptions|testGetAttributeWithTemplateAsObject)).)*$' \ + --verbose || ret=1 fi done
-%if %{with_ext} -: Test suite with extension -%{_bindir}/php --define extension=ext/NTS/modules/%{ext_name}.so \ - %{_bindir}/phpunit --verbose || ret=1 -%endif - exit $ret %else : Tests skipped @@ -282,20 +180,16 @@ exit $ret %doc CHANGELOG README.rst composer.json # Lib %{phpdir}/Twig -%if %{with_ext} -# Ext -## NTS -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{ext_name}.so -## ZTS -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{ext_name}.so -%endif -%endif
%changelog +* Tue Aug 27 2019 Remi Collet remi@remirepo.net - 1.42.3-1 +- update to 1.42.3 +- use symfony/debug v3 +- use phpunit v7 +- raise dependency on PHP 5.5 +- drop support of the C extension + * Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 1.42.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources index a4f8399..9989652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz) = ec5fd526d2c6a9d740748416e567a77c50ccf07259e8b7a0c4a6f035ccfa23f54cb29291695b2260ad51250101a00592f69f387c294558fd664fc97dd3bef362 +SHA512 (php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz) = 617b303b4c8a10347125553c7ab48d5522a751d41e7eec51d125379a731f14bf2b912cecf4367201fe029352f25acf66bc29f084d9217fd8809b4f7e5f21e89a
arch-excludes@lists.fedoraproject.org