diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | php-horde-turba.spec | 31 |
2 files changed, 17 insertions, 21 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-horde-turba.spec b/php-horde-turba.spec index 7c088f0..9c4af19 100644 --- a/php-horde-turba.spec +++ b/php-horde-turba.spec @@ -11,7 +11,7 @@ %global pear_channel pear.horde.org Name: php-horde-turba -Version: 4.2.19 +Version: 4.2.20 Release: 1%{?dist} Summary: A web based address book @@ -20,7 +20,6 @@ License: ASL 1.0 URL: http://www.horde.org/apps/turba Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext BuildRequires: php(language) >= 5.3.0 @@ -146,7 +145,6 @@ done %install cd %{pear_name}-%{version} -rm -rf %{buildroot} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files @@ -172,8 +170,6 @@ do done | tee ../%{pear_name}.lang -%clean -rm -rf %{buildroot} %check @@ -182,21 +178,12 @@ cd %{pear_name}-%{version}/test/Turba sed -e 's/function testDuplicateDetectionFromAsWithNoEmail/function SKIP_testDuplicateDetectionFromAsWithNoEmail/' \ -i Unit/Driver/Base.php -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 %{_bindir}/phpunit . || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit . || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --verbose . -# remirepo:2 -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose . || ret=1 + fi +done exit $ret @@ -212,7 +199,6 @@ fi %files -f %{pear_name}.lang -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %attr(0770,apache,apache) %dir %{_sysconfdir}/horde/%{pear_name} @@ -221,7 +207,7 @@ fi %attr(0660,apache,apache) %config %{_sysconfdir}/horde/%{pear_name}/*.xml %{pear_xmldir}/%{name}.xml %{pear_datadir}/turba -%{pear_testdir}/turba +%doc %{pear_testdir}/turba %{_bindir}/turba-convert-datatree-shares-to-sql %{_bindir}/turba-convert-sql-shares-to-sqlng %{_bindir}/turba-import-openxchange @@ -242,6 +228,9 @@ fi %changelog +* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 4.2.20-1 +- Update to 4.2.20 + * Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 4.2.19-1 - Update to 4.2.19 |