diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | PHP_CodeSniffer-role.patch | 10 | ||||
| -rw-r--r-- | php-pear-PHP-CodeSniffer.spec | 37 |
3 files changed, 24 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch deleted file mode 100644 index 6a7d5f8..0000000 --- a/PHP_CodeSniffer-role.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- package.xml.old 2014-12-05 12:39:59.000000000 +0100 -+++ package.xml 2014-12-05 12:40:45.000000000 +0100 -@@ -1949,6 +1949,7 @@ - <filelist> - <install as="phpcs" name="scripts/phpcs" /> - <install as="phpcbf" name="scripts/phpcbf" /> -+ <install as="phpcs-svn-pre-commit" name="scripts/phpcs-svn-pre-commit" /> - <install as="README" name="README.md" /> - <install as="CONTRIBUTING" name="CONTRIBUTING.md" /> - <install as="LICENCE" name="licence.txt" /> diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 1763208..df3a308 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.8.1 +Version: 3.0.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,29 +22,31 @@ License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Patch0: %{pear_name}-role.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -BuildRequires: php-phpunit-PHPUnit >= 3.5.0 +BuildRequires: php-phpunit-PHPUnit Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.8.0 +Requires: php(language) >= 5.4 +Requires: php-tokenizer +Requires: php-xmlwriter +Requires: php-simplexml +# From phpcompatinfo report for version 3.0.0 +Requires: php-reflection Requires: php-ctype Requires: php-date Requires: php-dom +Requires: php-json Requires: php-iconv +Requires: php-pcntl Requires: php-pcre -Requires: php-reflection Requires: php-soap Requires: php-spl -Requires: php-tokenizer -Requires: php-xmlwriter Provides: php-pear(%{pear_name}) = %{version} Provides: php-composer(squizlabs/php_codesniffer) = %{version} @@ -60,9 +62,6 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c -# install scripts/phpcs-svn-pre-commit properly -%patch0 -p0 -b .old - cd %{pear_name}-%{version} mv ../package.xml %{pear_name}.xml @@ -72,7 +71,6 @@ mv ../package.xml %{pear_name}.xml %install -rm -rf %{buildroot} cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml @@ -90,7 +88,7 @@ cd %{pear_name}-%{version}/tests # Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. ret=0 -for cmd in php php56 php70 php71; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit AllTests.php || ret=1 fi @@ -98,10 +96,6 @@ done exit $ret -%clean -rm -rf %{buildroot} - - %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : @@ -114,7 +108,6 @@ fi %files -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} @@ -122,10 +115,14 @@ fi %{pear_phpdir}/PHP %{_bindir}/phpcbf %{_bindir}/phpcs -%{_bindir}/phpcs-svn-pre-commit %changelog +* Thu May 4 2017 Remi Collet <remi@remirepo.net> - 3.0.0-1 +- Update to 3.0.0 +- raise dependency on PHP >= 5.4 +- drop phpcs-svn-pre-commit command + * Thu Mar 02 2017 Remi Collet <remi@remirepo.net> - 2.8.1-1 - Update to 2.8.1 |