summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-15 11:11:21 +0200
committerRemi Collet <remi@remirepo.net>2017-05-15 11:11:21 +0200
commit68f9bb80ada8101865ef031388ebbfa03e886289 (patch)
tree260b56b348211d70980881bbc693b80bc76171ef
parent8506474862f946aed02680ae329d50eb3bdd4020 (diff)
-rw-r--r--.gitignore7
-rw-r--r--composer.json3
-rwxr-xr-xmakesrc.sh28
-rw-r--r--php-phpmyadmin-shapefile.spec31
4 files changed, 21 insertions, 48 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/composer.json b/composer.json
index f8b5ade..b4968ec 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
"ext-dbase": "For dbf files parsing"
},
"require-dev": {
- "phpunit/phpunit": "~5.2 || ~4.8"
+ "phpunit/php-code-coverage": "*",
+ "phpunit/phpunit": "~4.8 || ~5.7"
},
"autoload": {
"psr-4": {
diff --git a/makesrc.sh b/makesrc.sh
deleted file mode 100755
index 87d223d..0000000
--- a/makesrc.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-NAME=$(basename $PWD)
-OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
-PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
-SHORT=${COMMIT:0:7}
-
-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
-
-echo "Cloning..."
-rm -rf $PROJECT-$COMMIT
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
-
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer.json
-popd
-
-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
-
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
-
-echo "Done."
diff --git a/php-phpmyadmin-shapefile.spec b/php-phpmyadmin-shapefile.spec
index 9de0a6a..3c1a103 100644
--- a/php-phpmyadmin-shapefile.spec
+++ b/php-phpmyadmin-shapefile.spec
@@ -7,9 +7,7 @@
# Please, preserve the changelog entries
#
-##TODO next version will have tests back
-
-%global gh_commit ee3413bda4cfc5683f088c2f232aab5b27339781
+%global gh_commit e23b767f2a81f61fee3fc09fc062879985f3e224
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpmyadmin
%global gh_project shapefile
@@ -18,7 +16,7 @@
%global ns_project ShapeFile
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.0
+Version: 2.1
Release: 1%{?dist}
Summary: ESRI ShapeFile library for PHP
@@ -31,7 +29,8 @@ BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 5.4
# For tests, from composer.json "require-dev": {
-# "phpunit/phpunit": "~5.2 || ~4.8"
+# "phpunit/php-code-coverage": "*",
+# "phpunit/phpunit": "~4.8 || ~5.7"
BuildRequires: php-composer(phpunit/phpunit) >= 4.8
%endif
# For autoloader
@@ -97,21 +96,12 @@ cat << 'EOF' | tee vendor/autoload.php
require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
EOF
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit --no-coverage || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --no-coverage || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --no-coverage --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
+ fi
+done
exit $ret
%else
: Test suite disabled
@@ -128,6 +118,9 @@ exit $ret
%changelog
+* Mon May 15 2017 Remi Collet <remi@remirepo.net> - 2.1-1
+- Update to 2.1
+
* Mon Jan 23 2017 Remi Collet <remi@remirepo.net> - 2.0-1
- update to 3.0 with vendor namespace