summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json15
-rw-r--r--php-bacon-qr-code2.spec95
2 files changed, 75 insertions, 35 deletions
diff --git a/composer.json b/composer.json
index 086f4c5..d66d586 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,12 @@
"license" : "BSD-2-Clause",
"homepage": "https://github.com/Bacon/BaconQrCode",
"require": {
- "php": "^5.4|^7.0",
- "ext-iconv": "*"
+ "php": "^7.1",
+ "ext-iconv": "*",
+ "dasprid/enum": "^1.0"
},
"suggest": {
- "ext-gd": "to generate QR code images"
+ "ext-imagick": "to generate QR code images"
},
"authors": [
{
@@ -19,11 +20,13 @@
}
],
"autoload": {
- "psr-0": {
- "BaconQrCode": "src/"
+ "psr-4": {
+ "BaconQrCode\\": "src/"
}
},
"require-dev": {
- "phpunit/phpunit": "^4.8"
+ "phpunit/phpunit": "^6.4",
+ "squizlabs/php_codesniffer": "^3.1",
+ "phly/keep-a-changelog": "^1.4"
}
}
diff --git a/php-bacon-qr-code2.spec b/php-bacon-qr-code2.spec
index dace8d2..221baad 100644
--- a/php-bacon-qr-code2.spec
+++ b/php-bacon-qr-code2.spec
@@ -1,12 +1,12 @@
-# remirepo/fedora spec file for php-bacon-qr-code
+# remirepo/fedora spec file for php-bacon-qr-code2
#
-# Copyright (c) 2017 Remi Collet
+# Copyright (c) 2017-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 5a91b62b9d37cee635bbf8d553f4546057250bee
+%global gh_commit eaac909da3ccc32b748a65b127acd8918f58d9b0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner Bacon
%global gh_project BaconQrCode
@@ -17,45 +17,67 @@
%global ns_vendor %nil
%global ns_project %{gh_project}
%global php_home %{_datadir}/php
+%global major 2
%global with_tests 0%{!?_without_tests:1}
-Name: php-%{pk_project}
-Version: 1.0.3
+Name: php-%{pk_project}%{major}
+Version: 2.0.0
Release: 1%{?dist}
Summary: QR code generator for PHP
Group: Development/Libraries
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0: %{name}-%{version}-%{gh_short}.tgz
+Source1: makesrc.sh
BuildArch: noarch
%if %{with_tests}
# For tests
-BuildRequires: php(language) >= 5.4
-BuildRequires: php-gd
-BuildRequires: php-reflection
-BuildRequires: php-simplexml
-BuildRequires: php-ctype
+BuildRequires: php(language) >= 7.1
BuildRequires: php-iconv
+BuildRequires: php-imagick
+BuildRequires: php-ctype
BuildRequires: php-spl
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: php-xmlwriter
+BuildRequires: php-reflection
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/enum) < 2)
+# remirepo:3
+%else
+BuildRequires: php-dasprid-enum
+%endif
+# From composer.json, "require-dev": {
+# "phpunit/phpunit": "^6.4",
+# "squizlabs/php_codesniffer": "^3.1",
+# "phly/keep-a-changelog": "^1.4"
+BuildRequires: phpunit6
# Required by autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
# From composer.json, "require": {
-# "php": ">=5.3.3"
-Requires: php(language) >= 5.3.3
+# "php": "^7.1",
+# "ext-iconv": "*",
+# "dasprid/enum": "^1.0"
+Requires: php(language) >= 7.1
Requires: php-iconv
# From composer.json, "suggest": {
-# "ext-gd": "to generate QR code images"
-Requires: php-gd
-# From phpcompatinfo report for version 1.0.1
-Requires: php-reflection
-Requires: php-simplexml
+# "ext-imagick": "to generate QR code images"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/enum) < 2)
+Recommends: php-imagick
+# remirepo:4
+%else
+Requires: php-dasprid-enum
+Requires: php-imagick
+%endif
+# From phpcompatinfo report for version 2.0.0
Requires: php-ctype
Requires: php-spl
+Requires: php-xmlwriter
# Required by autoloader
Requires: php-composer(fedora/autoloader)
@@ -71,17 +93,21 @@ As the Reed Solomon codec implementation of the ZXing library
performs quite slow in PHP, it was exchanged with the implementation
by Phil Karn.
-Autoloader: %{php_home}/%{ns_project}/autoload.php
+Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-cat << 'EOF' | tee src/%{ns_project}/autoload.php
+cat << 'EOF' | tee src/autoload.php
<?php
/* Autoloader for %{name} and its dependencies */
require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', __DIR__);
+\Fedora\Autoloader\Dependencies::required([
+ '%{php_home}/DASPRiD/Enum/autoload.php',
+]);
+
EOF
@@ -91,8 +117,8 @@ EOF
%install
: Library
-mkdir -p %{buildroot}%{php_home}
-cp -pr src/%{ns_project} %{buildroot}%{php_home}/%{ns_project}
+mkdir -p %{buildroot}%{php_home}
+cp -pr src %{buildroot}%{php_home}/%{ns_project}%{major}
%check
@@ -103,16 +129,16 @@ then
exit 0
fi
-cd tests
-cat << 'EOF' | tee bootstrap.php
+mkdir vendor
+cat << 'EOF' | tee vendor/autoload.php
<?php
-require '%{buildroot}%{php_home}/%{ns_project}/autoload.php';
+require '%{buildroot}%{php_home}/%{ns_project}%{major}/autoload.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php71 php72 php73 php74; do
if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose || ret=1
+ $cmd %{_bindir}/phpunit6 --verbose || ret=1
fi
done
exit $ret
@@ -122,14 +148,25 @@ exit $ret
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
%doc README.md
-%{php_home}/%{ns_project}
+%{php_home}/%{ns_project}%{major}
%changelog
+* Mon Sep 2 2019 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- rename to php-bacon-qr-code2
+- move installation to /usr/share/php/BaconQrCode2
+- raise dependency on PHP 7.1
+- add dependency on dasprid/enum
+- use phpunit6
+- use git snapshot to retrieve test suite
+- switch from php-gd to php-imagick
+
* Thu Oct 19 2017 Remi Collet <remi@remirepo.net> - 1.0.3-1
- Update to 1.0.3