summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json52
-rw-r--r--php-khanamiryan-qrcode-detector-decoder.spec15
2 files changed, 41 insertions, 26 deletions
diff --git a/composer.json b/composer.json
index 53267b8..4e75736 100644
--- a/composer.json
+++ b/composer.json
@@ -1,24 +1,34 @@
{
- "name": "khanamiryan/qrcode-detector-decoder",
- "type": "library",
- "description": "QR code decoder / reader",
- "keywords": ["qr", "zxing", "barcode"],
- "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder",
- "license": "MIT",
- "authors": [{
- "name": "Ashot Khanamiryan",
- "email": "a.khanamiryan@gmail.com",
- "homepage": "https://github.com/khanamiryan",
- "role": "Developer"
- }],
- "require": {
- "php": "^5.6|^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7"
- },
- "autoload": {
- "classmap": ["lib/"],
- "files": ["lib/common/customFunctions.php"]
+ "name": "khanamiryan/qrcode-detector-decoder",
+ "type": "library",
+ "description": "QR code decoder / reader",
+ "keywords": [
+ "qr",
+ "zxing",
+ "barcode"
+ ],
+ "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Ashot Khanamiryan",
+ "email": "a.khanamiryan@gmail.com",
+ "homepage": "https://github.com/khanamiryan",
+ "role": "Developer"
}
+ ],
+ "require": {
+ "php": "^5.6|^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7"
+ },
+ "autoload": {
+ "psr-4": {
+ "Zxing\\": "lib/"
+ },
+ "files": [
+ "lib/Common/customFunctions.php"
+ ]
+ }
}
diff --git a/php-khanamiryan-qrcode-detector-decoder.spec b/php-khanamiryan-qrcode-detector-decoder.spec
index d7c15f3..6d287e1 100644
--- a/php-khanamiryan-qrcode-detector-decoder.spec
+++ b/php-khanamiryan-qrcode-detector-decoder.spec
@@ -1,12 +1,12 @@
# remirepo/fedora spec file for php-khanamiryan-qrcode-detector-decoder
#
-# Copyright (c) 2017 Remi Collet
+# Copyright (c) 2017-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 96d5f80680b04803c4f1b69d6e01735e876b80c7
+%global gh_commit 4ff2f14006930631ed30f0d15da72b032c96bc0a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner khanamiryan
%global gh_project php-qrcode-detector-decoder
@@ -20,7 +20,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1
+Version: 1.0.1
Release: 1%{?dist}
Summary: QR code generator for PHP
@@ -93,7 +93,7 @@ find lib -name \*.php -exec chmod -x {} \;
cat << 'EOF' | tee -a lib/autoload.php
\Fedora\Autoloader\Dependencies::required([
- __DIR__ . '/common/customFunctions.php',
+ __DIR__ . '/Common/customFunctions.php',
]);
EOF
@@ -107,7 +107,7 @@ cp -pr lib %{buildroot}%{php_home}/%{ns_project}
%check
%if %{with_tests}
mkdir vendor
-cat << 'EOF' | tee vendor/autoload.php
+cat << 'EOF' | tee tests/bootstrap.php
<?php
require '%{buildroot}%{php_home}/%{ns_project}/autoload.php';
EOF
@@ -133,6 +133,11 @@ exit $ret
%changelog
+* Tue Apr 17 2018 Remi Collet <remi@remirepo.net> - 1.0.1-1
+- update to 1.0.1 - broken
+- BC break, see https://github.com/khanamiryan/php-qrcode-detector-decoder/issues/40
+- missing file, see https://github.com/khanamiryan/php-qrcode-detector-decoder/issues/38
+
* Tue Jun 27 2017 Remi Collet <remi@remirepo.net> - 1-1
- initial package, version 1
- open https://github.com/khanamiryan/php-qrcode-detector-decoder/issues/29