v1.15.7

3 files changed, 96 insertions, 67 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index 05d4df6..c5136ec 100644
--- a/composer.json
+++ b/composer.json
@@ -1,49 +1,79 @@
 {
-    "name": "tecnickcom/tc-lib-barcode",
-    "description": "PHP library to generate linear and bidimensional barcodes",
-    "type": "library",
-    "homepage": "http://www.tecnick.com",
-    "license": "LGPL-3.0",
-    "keywords": ["tc-lib-barcode", "barcode", "CODE 39", "ANSI MH10.8M-1983", "USD-3", "3 of 9", "CODE 93", "USS-93", "Standard 2 of 5", "Interleaved 2 of 5", "CODE 128 A B C", "UPC", "EAN 8", "EAN 13", "UPC-A", "UPC-E", "MSI", "POSTNET", "PLANET", "RMS4CC", "Royal Mail", "CBC", "KIX", "Klant", "Intelligent Mail Barcode", "Onecode", "USPS-B-3200", "CODABAR", "CODE 11", "PHARMACODE", "PHARMACODE TWO-TRACKS", "Datamatrix", "ECC200", "QR-Code", "PDF417"],
-    "authors": [
-        {
-            "name": "Nicola Asuni",
-            "email": "info@tecnick.com",
-            "role": "lead"
-        }
-    ],
-    "require": {
-        "php": ">=5.4",
-        "ext-bcmath": "*",
-        "ext-date": "*",
-        "ext-gd": "*",
-        "ext-pcre": "*",
-        "tecnickcom/tc-lib-color": "^1.12.6"
-    },
-    "require-dev": {
-        "apigen/apigen" : "^4.1.2",
-        "bartlett/php-compatinfo" : "^5.0.4",
-        "pdepend/pdepend" : "^2.5.0",
-        "phploc/phploc" : "^2.1.5 || ^3.0.1",
-        "phpmd/phpmd" : "^2.6.0",
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0",
-        "sebastian/phpcpd" : "^2.0.4 || 3.0.0",
-        "squizlabs/php_codesniffer": "^2.8.0 || ^3.0.0"
-    },
-    "autoload": {
-        "psr-4":{
-            "Com\\Tecnick\\Barcode\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4":{
-            "Test\\": "test"
-        }
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "git@github.com:tecnickcom/tc-lib-color.git"
-        }
-    ]
+  "name": "tecnickcom/tc-lib-barcode",
+  "description": "PHP library to generate linear and bidimensional barcodes",
+  "type": "library",
+  "homepage": "http://www.tecnick.com",
+  "license": "LGPL-3.0",
+  "keywords": [
+    "tc-lib-barcode",
+    "barcode",
+    "CODE 39",
+    "ANSI MH10.8M-1983",
+    "USD-3",
+    "3 of 9",
+    "CODE 93",
+    "USS-93",
+    "Standard 2 of 5",
+    "Interleaved 2 of 5",
+    "CODE 128 A B C",
+    "UPC",
+    "EAN 8",
+    "EAN 13",
+    "UPC-A",
+    "UPC-E",
+    "MSI",
+    "POSTNET",
+    "PLANET",
+    "RMS4CC",
+    "Royal Mail",
+    "CBC",
+    "KIX",
+    "Klant",
+    "Intelligent Mail Barcode",
+    "Onecode",
+    "USPS-B-3200",
+    "CODABAR",
+    "CODE 11",
+    "PHARMACODE",
+    "PHARMACODE TWO-TRACKS",
+    "Datamatrix",
+    "ECC200",
+    "QR-Code",
+    "PDF417"
+  ],
+  "authors": [
+    {
+      "name": "Nicola Asuni",
+      "email": "info@tecnick.com",
+      "role": "lead"
+    }
+  ],
+  "require": {
+    "php": ">=5.4",
+    "ext-bcmath": "*",
+    "ext-date": "*",
+    "ext-gd": "*",
+    "ext-pcre": "*",
+    "tecnickcom/tc-lib-color": "^1.12.7"
+  },
+  "require-dev": {
+    "apigen/apigen": "^4.1.2",
+    "bartlett/php-compatinfo": "^5.0.4",
+    "pdepend/pdepend": "^2.5.0",
+    "phploc/phploc": "^2.1.5 || ^3.0.1",
+    "phpmd/phpmd": "^2.6.0",
+    "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0",
+    "sebastian/phpcpd": "^2.0.4 || 3.0.0",
+    "squizlabs/php_codesniffer": "^2.8.0 || ^3.0.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Com\\Tecnick\\Barcode\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Test\\": "test"
+    }
+  }
 }
diff --git a/php-tecnickcom-tc-lib-barcode.spec b/php-tecnickcom-tc-lib-barcode.spec
index 74e8fb0..6a69437 100644
--- a/php-tecnickcom-tc-lib-barcode.spec
+++ b/php-tecnickcom-tc-lib-barcode.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-tecnickcom-tc-lib-barcode
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    18b8b9224c995cd9d7518e8551be833cbc31b323
+%global gh_commit    96ad2aae7ff7f755e1a35d421377058e8e75afc1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global c_vendor     tecnickcom
 %global gh_owner     tecnickcom
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.15.6
+Version:        1.15.7
 Release:        1%{?dist}
 Summary:        PHP library to generate linear and bidimensional barcodes
 
@@ -24,7 +24,6 @@ License:        LGPLv3+
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
@@ -97,7 +96,6 @@ sed -e 's:^require:////require:' \
 
 
 %install
-rm -rf     %{buildroot}
 mkdir -p   $(dirname %{buildroot}%{php_project})
 cp -pr src %{buildroot}%{php_project}
 cp -p  resources/autoload.php \
@@ -114,18 +112,13 @@ require '%{php_project}/../Color/autoload.php';
 require __DIR__ . '/../test/TestStrings.php';
 EOF
 
-%{phpunit} --no-coverage --verbose
-
-#remirepo:12
 ret=0
-for cmd in php56; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit --verbose || ret=1
-   fi
-done
-for cmd in php70 php71; do
+for cmd in "php %{phpunit}" \
+    "php70 %{_bindir}/phpunit6" \
+    "php71 %{_bindir}/phpunit6" \
+    "php72 %{_bindir}/phpunit6"; do
    if which $cmd; then
-      $cmd %{_bindir}/phpunit6 --verbose || ret=1
+      $cmd --no-coverage --verbose || ret=1
    fi
 done
 exit $ret
@@ -134,12 +127,7 @@ exit $ret
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -148,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan  2 2018 Remi Collet <remi@remirepo.net> - 1.15.7-1
+- Update to 1.15.7
+
 * Sun Feb 12 2017 Remi Collet <remi@remirepo.net.org> - 1.15.6-1
 - update to 1.15.6 (no change)
 - use phpunit6 on F26+