- updated to 3.4.0

diff --git a/case-sensitive.patch b/case-sensitive.patch
deleted file mode 100644 (file)
index 967a479..0000000
--- a/case-sensitive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer.php~  2014-12-18 15:30:31.000000000 +0200
-+++ PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer.php   2014-12-18 15:31:17.858092309 +0200
-@@ -1559,7 +1559,7 @@
-                 $testPath = $path;
-             }
- 
--            $pattern = '`'.$pattern.'`i';
-+            $pattern = '`'.$pattern.'`';
-             if (preg_match($pattern, $testPath) === 1) {
-                 return true;
-             }

diff --git a/peardeps.patch b/peardeps.patch
deleted file mode 100644 (file)
index 9ed0496..0000000
--- a/peardeps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer/CLI.php~      2014-12-18 15:33:47.000000000 +0200
-+++ PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer/CLI.php       2014-12-18 15:35:53.698306987 +0200
-@@ -80,11 +80,7 @@
-             define('PHP_CODESNIFFER_CBF', false);
-         }
- 
--        if (is_file(dirname(__FILE__).'/../CodeSniffer/Reporting.php') === true) {
--            include_once dirname(__FILE__).'/../CodeSniffer/Reporting.php';
--        } else {
--            include_once 'PHP/CodeSniffer/Reporting.php';
--        }
-+        include_once 'PHP/CodeSniffer/Reporting.php';
- 
-         PHP_CodeSniffer_Reporting::startTiming();
-         $this->checkRequirements();
-@@ -105,11 +105,7 @@
-             define('PHP_CODESNIFFER_CBF', true);
-         }
- 
--        if (is_file(dirname(__FILE__).'/../CodeSniffer/Reporting.php') === true) {
--            include_once dirname(__FILE__).'/../CodeSniffer/Reporting.php';
--        } else {
--            include_once 'PHP/CodeSniffer/Reporting.php';
--        }
-+        include_once 'PHP/CodeSniffer/Reporting.php';
- 
-         PHP_CodeSniffer_Reporting::startTiming();
-         $this->checkRequirements();

diff --git a/phpcs.spec b/phpcs.spec
index 24ae873f24d4a74fc552be9689ee20b1dc3f71b2..747e85690f0519d4a4c89cf3dbe834e7866f5e69 100644 (file)
--- a/phpcs.spec
+++ b/phpcs.spec
@@ -3,19 +3,17 @@
 # $ phpcs --config-set default_standard PEAR
 # PHP Warning:  file_put_contents(/usr/share/pear/data/PHP_CodeSniffer/CodeSniffer.conf): failed to open stream: Permission denied in /usr/share/pear/PHP/CodeSniffer.php on line 1532
 %define                pearname        PHP_CodeSniffer
-%define                php_min_version 5.2.1
+%define                php_min_version 5.4.0
 %include       /usr/lib/rpm/macros.php
 Summary:       PHP_CodeSniffer tokenises PHP code and detects violations of a defined set of coding standards
 Summary(pl.UTF-8):     PHP_CodeSniffer analizuje kod PHP pod kątem naruszeń zdefiniowanych standardów kodowania
 Name:          phpcs
-Version:       2.9.1
+Version:       3.4.0
 Release:       1
 License:       BSD License
 Group:         Development/Languages/PHP
 Source0:       https://pear.php.net/get/%{pearname}-%{version}.tgz
-# Source0-md5: 50855c5c3bbe01b0180438f50f617064
-Patch0:                case-sensitive.patch
-Patch1:                peardeps.patch
+# Source0-md5: daedf0015977e8d398f381bb2e05ae6b
 URL:           https://github.com/squizlabs/PHP_CodeSniffer
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -53,10 +51,6 @@ przez programistów pewnych częstych błędów semantycznych.
 
 %prep
 %pear_package_setup
-%patch0 -p1
-%patch1 -p1
-
-mv .%{_bindir}/scripts .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,10 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc install.log scripts
+%doc install.log
 %{php_pear_dir}/.registry/*.reg
 %attr(755,root,root) %{_bindir}/phpcs
 %attr(755,root,root) %{_bindir}/phpcbf
 %{php_pear_dir}/PHP/CodeSniffer
-%{php_pear_dir}/PHP/CodeSniffer.php
 %{php_pear_dir}/data/PHP_CodeSniffer