remi pushed to php-phpunit-phpcpd (master). "- Update to 2.0.2 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 05:54:49 UTC 2015
>From 43331e7d8beec8de32265ec0e6636df4365eae4c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 27 Mar 2015 06:54:35 +0100
Subject: - Update to 2.0.2 - use composer dependencies - fix license handling
diff --git a/.gitignore b/.gitignore
index 38e5dcc..9d9ecdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ phpcpd-1.3.1.tgz
/phpcpd-1.3.5.tgz
/phpcpd-1.4.1.tgz
/phpcpd-2.0.1.tar.gz
+/phpcpd-2.0.2.tar.gz
diff --git a/php-phpunit-phpcpd.spec b/php-phpunit-phpcpd.spec
index 216cfad..45818a3 100644
--- a/php-phpunit-phpcpd.spec
+++ b/php-phpunit-phpcpd.spec
@@ -1,4 +1,4 @@
-%global gh_commit a9462153f2dd90466a010179901d31fbff598365
+%global gh_commit d3ad100fdf15805495f6ff19f473f4314c99390c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcpd
@@ -8,8 +8,8 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-phpunit-phpcpd
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
Summary: Copy/Paste Detector (CPD) for PHP code
Group: Development/Libraries
@@ -28,20 +28,31 @@ BuildRequires: php(language) >= 5.3.3
BuildRequires: %{_bindir}/phpab
%if %{with_tests}
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-phpunit-FinderFacade >= 1.1.0
-BuildRequires: php-phpunit-Version >= 1.0.3
-BuildRequires: php-symfony-console >= 2.2.0
-BuildRequires: php-phpunit-PHP-Timer >= 1.0.4
-BuildRequires: php-theseer-fDOMDocument >= 1.4
+BuildRequires: php-composer(sebastian/finder-facade) >= 1.1
+BuildRequires: php-composer(sebastian/version) >= 1.0
+BuildRequires: php-composer(symfony/console) >= 2.2
+BuildRequires: php-composer(phpunit/php-timer) >= 1.0
+BuildRequires: php-composer(theseer/fdomdocument) >= 1.4
%endif
-# From composer.json
+# From composer.json, requires
+# "php": ">=5.3.3",
+# "sebastian/finder-facade": "~1.1",
+# "sebastian/version": "~1.0",
+# "symfony/console": "~2.2",
+# "phpunit/php-timer": "~1.0",
+# "theseer/fdomdocument": "~1.4"
Requires: php(language) >= 5.3.3
-Requires: php-phpunit-FinderFacade >= 1.1.0
-Requires: php-phpunit-Version >= 1.0.3
-Requires: php-symfony-console >= 2.2.0
-Requires: php-phpunit-PHP-Timer >= 1.0.4
-Requires: php-theseer-fDOMDocument >= 1.4
+Requires: php-composer(sebastian/finder-facade) >= 1.1
+Requires: php-composer(sebastian/finder-facade) < 2
+Requires: php-composer(sebastian/version) >= 1.0
+Requires: php-composer(sebastian/version) < 2
+Requires: php-composer(symfony/console) >= 2.2
+Requires: php-composer(symfony/console) < 3
+Requires: php-composer(phpunit/php-timer) >= 1.0
+Requires: php-composer(phpunit/php-timer) < 2
+Requires: php-composer(theseer/fdomdocument) >= 1.4
+Requires: php-composer(theseer/fdomdocument) < 2
# From phpcompatinfo report for version 2.0.1
Requires: php-dom
Requires: php-mbstring
@@ -85,7 +96,6 @@ install -D -p -m 755 phpcpd %{buildroot}%{_bindir}/phpcpd
%check
phpunit \
--bootstrap src/autoload.php \
- -d date.timezone=UTC \
tests
%endif
@@ -98,12 +108,19 @@ fi
%files
-%doc LICENSE README.md composer.json
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md composer.json
%{php_home}/PHPCPD
%{_bindir}/phpcpd
%changelog
+* Thu Mar 26 2015 Remi Collet <remi at fedoraproject.org> - 2.0.2-1
+- Update to 2.0.2
+- use composer dependencies
+- fix license handling
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/phpcpd-rpm.patch b/phpcpd-rpm.patch
index d904f78..2551531 100644
--- a/phpcpd-rpm.patch
+++ b/phpcpd-rpm.patch
@@ -1,15 +1,15 @@
diff -up ./phpcpd.rpm ./phpcpd
---- ./phpcpd.rpm 2014-05-04 10:32:06.000000000 +0200
-+++ ./phpcpd 2014-05-04 10:32:59.000000000 +0200
+--- ./phpcpd.rpm 2015-03-26 19:04:39.896182549 +0100
++++ ./phpcpd 2015-03-26 19:05:35.300399520 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
+#!/usr/bin/php
<?php
- /**
- * phpcpd
-@@ -46,23 +46,7 @@
- ini_set('mbstring.func_overload', 0);
- ini_set('mbstring.internal_encoding', NULL);
+ /*
+ * This file is part of PHP Copy/Paste Detector (PHPCPD).
+@@ -15,23 +15,7 @@ if (ini_get('mbstring.internal_encoding'
+ ini_set('mbstring.internal_encoding', NULL);
+ }
-$loaded = false;
-
diff --git a/sources b/sources
index c3c9330..4639f6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4387a5b7a8235a43dfb0af2b8c5f7a04 phpcpd-2.0.1.tar.gz
+4d72e72a2fa535848988a1994e091e3f phpcpd-2.0.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/php-phpunit-phpcpd.git/commit/?h=master&id=43331e7d8beec8de32265ec0e6636df4365eae4c
More information about the scm-commits
mailing list