v1.4.5

3 files changed, 58 insertions, 62 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 5cfbcbc..50fe058 100644
--- a/composer.json
+++ b/composer.json
@@ -1,46 +1,42 @@
 {
-    "name": "tecnickcom/tc-lib-pdf-graph",
-    "description": "PHP library containing PDF graphic and geometric methods",
-    "type": "library",
-    "homepage": "http://www.tecnick.com",
-    "license": "LGPL-3.0",
-    "keywords": ["tc-lib-pdf-graph", "PDF", "graphic", "geometry", "transformation"],
-    "authors": [
-        {
-            "name": "Nicola Asuni",
-            "email": "info@tecnick.com",
-            "role": "lead"
-        }
-    ],
-    "require": {
-        "php": ">=5.4",
-        "ext-zlib": "*",
-        "tecnickcom/tc-lib-color": "^1.12.6",
-        "tecnickcom/tc-lib-pdf-encrypt": "^1.5.2"
-    },
-    "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\\Pdf\\Graph\\": "src"
-        }
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "git@github.com:tecnickcom/tc-lib-color.git"
-        },
-        {
-            "type": "vcs",
-            "url": "git@github.com:tecnickcom/tc-lib-pdf-encrypt.git"
-        }
-    ]
+  "name": "tecnickcom/tc-lib-pdf-graph",
+  "description": "PHP library containing PDF graphic and geometric methods",
+  "type": "library",
+  "homepage": "http://www.tecnick.com",
+  "license": "LGPL-3.0",
+  "keywords": [
+    "tc-lib-pdf-graph",
+    "PDF",
+    "graphic",
+    "geometry",
+    "transformation"
+  ],
+  "authors": [
+    {
+      "name": "Nicola Asuni",
+      "email": "info@tecnick.com",
+      "role": "lead"
+    }
+  ],
+  "require": {
+    "php": ">=5.4",
+    "ext-zlib": "*",
+    "tecnickcom/tc-lib-color": "^1.12.7",
+    "tecnickcom/tc-lib-pdf-encrypt": "^1.5.4"
+  },
+  "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\\Pdf\\Graph\\": "src"
+    }
+  }
 }
diff --git a/php-tecnickcom-tc-lib-pdf-graph.spec b/php-tecnickcom-tc-lib-pdf-graph.spec
index 3530f08..55bdfb6 100644
--- a/php-tecnickcom-tc-lib-pdf-graph.spec
+++ b/php-tecnickcom-tc-lib-pdf-graph.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-tecnickcom-tc-lib-pdf-graph
 #
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    264bed779bdb1f4e2ab17cfb611256e37a042d2d
+%global gh_commit    29f148cf30939edfc05ce25241f70a2ed7b72bd9
 %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.4.4
+Version:        1.4.5
 Release:        1%{?dist}
 Summary:        PHP library containing PDF graphic and geometric methods
 
@@ -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
@@ -72,7 +71,6 @@ grep -q '^%{version}$' VERSION
 
 
 %install
-rm -rf     %{buildroot}
 mkdir -p   $(dirname %{buildroot}%{php_project})
 cp -pr src %{buildroot}%{php_project}
 cp -p  resources/autoload.php \
@@ -89,14 +87,10 @@ require '%{php_project}/../../Color/autoload.php';
 EOF
 
 ret=0
-for cmd in php56 php; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
-   fi
-done
-for cmd in php70 php71; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit6 --no-coverage --verbose || ret=1
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+   if which $cmdarg; then
+      set $cmdarg
+      $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1
    fi
 done
 exit $ret
@@ -105,12 +99,7 @@ exit $ret
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -120,6 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan  2 2018 Remi Collet <remi@remirepo.net> - 1.4.5-1
+- Update to 1.4.5 (no change)
+
 * Sun Feb 12 2017 Remi Collet <remi@remirepo.net> - 1.4.4-1
 - update to 1.4.4 (no change)