From 4045c228ae86f0efab7df47c1a918464c5783563 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 May 2018 14:33:10 +0200 Subject: backport stuff --- .gitignore | 9 +++++++++ Makefile | 4 ++++ php-ringcentral-psr7.spec | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 Makefile diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f69818 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.bz2 +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..91b0fd5 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../common/Makefile + diff --git a/php-ringcentral-psr7.spec b/php-ringcentral-psr7.spec index a0374da..9a4a96a 100644 --- a/php-ringcentral-psr7.spec +++ b/php-ringcentral-psr7.spec @@ -1,3 +1,4 @@ +# remirepo spec file for php-ringcentral-psr7, from: # # Fedora spec file for php-ringcentral-psr7 # @@ -126,7 +127,7 @@ ln -s %{buildroot}%{phpdir}/RingCentral/Psr7/autoload.php vendor/autoload.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72; do +for PHP_EXEC in php %{?rhel:php54 php55 php56} php70 php71 php72; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1 fi -- cgit