From b67c8e627ce648a310cecaaf2070eb966024ef31 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Feb 2019 11:13:04 +0100 Subject: backport stuff --- .gitignore | 8 ++++++++ Makefile | 4 ++++ composer.json | 24 ++++++++++++++++++++++++ php-typo3-phar-stream-wrapper-get-source.sh | 1 + php-typo3-phar-stream-wrapper.spec | 3 ++- 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 composer.json 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/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..99b7365 --- /dev/null +++ b/composer.json @@ -0,0 +1,24 @@ +{ + "name": "typo3/phar-stream-wrapper", + "description": "Interceptors for PHP's native phar:// stream handling", + "type": "library", + "license": "MIT", + "homepage": "https://typo3.org/", + "keywords": ["php", "phar", "stream-wrapper", "security"], + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5" + }, + "autoload": { + "psr-4": { + "TYPO3\\PharStreamWrapper\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "TYPO3\\PharStreamWrapper\\Tests\\": "tests/" + } + } +} diff --git a/php-typo3-phar-stream-wrapper-get-source.sh b/php-typo3-phar-stream-wrapper-get-source.sh index b2ac62b..3947de4 100755 --- a/php-typo3-phar-stream-wrapper-get-source.sh +++ b/php-typo3-phar-stream-wrapper-get-source.sh @@ -55,6 +55,7 @@ pushd $TEMP_DIR pushd $GIT_DIR print "Checking out commit..." $GIT checkout $GIT_COMMIT + cp composer.json ${SPEC_DIR}/composer.json popd TAR_DIR=${GIT_NAME}-${GIT_COMMIT} diff --git a/php-typo3-phar-stream-wrapper.spec b/php-typo3-phar-stream-wrapper.spec index 999bf2f..7eaccad 100644 --- a/php-typo3-phar-stream-wrapper.spec +++ b/php-typo3-phar-stream-wrapper.spec @@ -1,3 +1,4 @@ +# remirepo spec file for php-typo3-phar-stream-wrapper, from: # # Fedora spec file for php-typo3-phar-stream-wrapper # @@ -59,7 +60,7 @@ Requires: php-spl Requires: php-composer(fedora/autoloader) # Weak dependencies -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-pecl(opcache) %endif -- cgit