summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-01-05 15:19:31 +0100
committerRemi Collet <fedora@famillecollet.com>2016-01-05 15:19:31 +0100
commitbca10e6aae5b2f9546a322442e50f345a4898968 (patch)
tree55951ee79060beae1020f661ff42a666a0ba1ccd
parentbeb07f561db943132dded2b0e89712d436a551b8 (diff)
php-di-invoker: add backport stuff
-rw-r--r--Makefile4
-rwxr-xr-xphp-di-invoker-get-source.sh2
-rw-r--r--php-di-invoker.spec15
3 files changed, 20 insertions, 1 deletions
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-di-invoker-get-source.sh b/php-di-invoker-get-source.sh
index ba71f5d..48b8385 100755
--- a/php-di-invoker-get-source.sh
+++ b/php-di-invoker-get-source.sh
@@ -43,6 +43,7 @@ print "GIT_REPO = $GIT_REPO"
print "GIT_DIR = $GIT_DIR"
TEMP_DIR=$(mktemp --dir)
+TAR_FILE=$PWD/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
pushd $TEMP_DIR
print "Cloning git repo..."
@@ -58,7 +59,6 @@ pushd $TEMP_DIR
mv $GIT_DIR $TAR_DIR
- TAR_FILE=`$RPM --eval='%{_sourcedir}'`/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
print "TAR_FILE = $TAR_FILE"
[ -e $TAR_FILE ] && rm -f $TAR_FILE
diff --git a/php-di-invoker.spec b/php-di-invoker.spec
index 652eef8..c3ad8aa 100644
--- a/php-di-invoker.spec
+++ b/php-di-invoker.spec
@@ -1,3 +1,4 @@
+# remirepo spec file for php-di-invoker, from:
#
# Fedora spec file for php-di-invoker
#
@@ -42,6 +43,7 @@ URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
Source1: %{name}-get-source.sh
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -111,6 +113,7 @@ AUTOLOAD
%install
+rm -rf %{buildroot}
mkdir -p %{buildroot}%{phpdir}/Invoker
cp -rp src/* %{buildroot}%{phpdir}/Invoker/
@@ -130,12 +133,21 @@ BOOTSTRAP
: Run tests
%{_bindir}/phpunit --verbose --bootstrap bootstrap.php
+
+if which php70; then
+ php70 %{_bindir}/phpunit --verbose --bootstrap bootstrap.php
+fi
%else
: Tests skipped
%endif
+%clean
+rm -rf %{buildroot}
+
+
%files
+%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -144,5 +156,8 @@ BOOTSTRAP
%changelog
+* Tue Jan 5 2016 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- backport for #remirepo
+
* Sun Jan 03 2016 Shawn Iwinski <shawn@iwin.ski> - 1.2.0-1
- Initial package