From bc83a9db1e70cfc7fe33da1e0f46fb714fef04b3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 11 Jun 2018 07:17:01 +0200
Subject: update to 3.0.1 (no change) ignore integration tests with old git
 command

---
 composer.json            |  1 -
 php-sebastian-diff3.spec | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 51b0083..aea9c92 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
             "email": "mail@kore-nordmann.de"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": "^7.1"
     },
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 430ad61..8b8b629 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    e09160918c66281713f1c324c1f4c4c3037ba1e8
+%global gh_commit    366541b989927187c4ca70490a35615d3fef2dce
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        Diff implementation
 
@@ -88,9 +88,15 @@ cat << 'EOF' | tee -a vendor/autoload.php
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process');
 EOF
 
+# remirepo:4
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+: Ignore tests using git command: unknown option 'unsafe-paths' with old git
+rm -r tests/Output/Integration
+%endif
+
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit7  --verbose || ret=1
@@ -113,6 +119,10 @@ exit $ret
 
 
 %changelog
+* Mon Jun 11 2018 Remi Collet <remi@remirepo.net> - 3.0.1-1
+- update to 3.0.1 (no change)
+- ignore integration tests with old git command
+
 * Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 3.0.0-1
 - normal build
 
-- 
cgit