summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-horde-Horde-Idna.spec31
2 files changed, 16 insertions, 22 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-Horde-Idna.spec b/php-horde-Horde-Idna.spec
index fabcf4e..462833d 100644
--- a/php-horde-Horde-Idna.spec
+++ b/php-horde-Horde-Idna.spec
@@ -18,7 +18,7 @@
%endif
Name: php-horde-Horde-Idna
-Version: 1.1.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: IDNA backend normalization package
@@ -27,7 +27,6 @@ License: BSD
URL: http://www.horde.org/
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
@@ -84,7 +83,6 @@ done
%install
-rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -106,31 +104,18 @@ done | tee ../%{pear_name}.lang
%if %{with_tests}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# 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
%else
: Test disabled, bootstrap build
%endif
-%clean
-rm -rf %{buildroot}
-
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -143,7 +128,6 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Idna/
@@ -154,6 +138,9 @@ fi
%changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- Update to 1.1.1
+
* Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
- add locales