diff options
| author | Remi Collet <remi@remirepo.net> | 2017-12-19 13:49:37 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-12-19 13:49:37 +0100 |
| commit | ae94442bb1ce84c8e9e31f912953a1d03f1bb7dc (patch) | |
| tree | cf70af53899deb7627a7e118f81ac16fafb589c5 | |
| parent | faf396d3054abb99591cf8e38e1222ec837fa13d (diff) | |
cleanup
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | php-horde-Horde-Text-Filter.spec | 32 |
2 files changed, 15 insertions, 25 deletions
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/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec index 96c1407..271f2c0 100644 --- a/php-horde-Horde-Text-Filter.spec +++ b/php-horde-Horde-Text-Filter.spec @@ -21,7 +21,6 @@ License: LGPLv2 URL: http://%{pear_channel}/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -85,7 +84,6 @@ done %install -rm -rf %{buildroot} cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml @@ -120,22 +118,6 @@ sed -e 's/testOfficeNamespace/SKIP_testOfficeNamespace/' \ -i MsofficeTest.php %endif -# remirepo:15 -run=0 -ret=0 -if which php56; then - php56 %{_bindir}/phpunit . || ret=1 - run=1 -fi -if which php70; then - php70 %{_bindir}/phpunit . || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit . || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then %if 0%{?rhel} == 6 # Only fails with PHP < 5.3.6, see http://3v4l.org/Vkcdu sed -e 's/testLinkurls/SKIP_testLinkurls/' \ @@ -144,14 +126,15 @@ sed -e 's/testMsoNormalCss/SKIP_testMsoNormalCss/' \ -i MsofficeTest.php %endif -%{_bindir}/phpunit --verbose . -# remirepo:2 -fi +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose . || ret=1 + fi +done exit $ret -%clean -rm -rf %{buildroot} %post @@ -166,12 +149,11 @@ fi %files -f %{pear_name}.lang -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/Text/Filter %{pear_phpdir}/Horde/Text/Filter.php -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name} %dir %{pear_datadir}/%{pear_name} %dir %{pear_datadir}/%{pear_name}/locale |