summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-13 06:34:00 +0200
committerRemi Collet <remi@remirepo.net>2017-04-13 06:34:00 +0200
commit1610ae0084fe8a801639cce584c7e76bb94baa5c (patch)
tree871369eb98bd8efc32072b17bc2f72e107e4da8f
parent03d09476b66675b9477227bc9bfce2627cbcbc4c (diff)
v1.6.1
-rw-r--r--.gitignore7
-rw-r--r--php-myclabs-deep-copy.spec38
2 files changed, 18 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec
index 27d3428..f0894cd 100644
--- a/php-myclabs-deep-copy.spec
+++ b/php-myclabs-deep-copy.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 5a5a9fc8025a08d8919be87d6884d5a92520cefe
+%global gh_commit 8e6e04167378abf1ddb4d3522d8755c5fd90d102
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner myclabs
%global gh_project DeepCopy
@@ -15,7 +15,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-myclabs-deep-copy
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
Summary: Create deep copies (clones) of your objects
@@ -27,7 +27,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
Source2: %{name}-autoload.php
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
# For tests
@@ -71,8 +70,6 @@ cp %{SOURCE2} src/%{gh_project}/autoload.php
%install
-rm -rf %{buildroot}
-
: Library
mkdir -p %{buildroot}%{php_home}
cp -pr src/%{gh_project} %{buildroot}%{php_home}/%{gh_project}
@@ -88,36 +85,20 @@ require '%{buildroot}%{php_home}/%{gh_project}/autoload.php';
require_once '%{php_home}/Doctrine/Common/Collections/autoload.php';
EOF
-# remirepo:13
-run=0
ret=0
-if which php56; then
- php56 -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
- %{_bindir}/phpunit --verbose || ret=1
- run=1
-fi
-if which php71; then
- php71 -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
- %{_bindir}/phpunit --verbose || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/php -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-%{_bindir}/phpunit --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
+ %{_bindir}/phpunit --verbose || ret=1
+ fi
+done
exit $ret
%else
: Test suite disabled
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
@@ -126,6 +107,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Apr 13 2017 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
* Fri Jan 27 2017 Remi Collet <remi@fedoraproject.org> - 1.6.0-1
- update to 1.6.0