summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-pq.spec16
1 files changed, 9 insertions, 7 deletions
diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec
index 3da6972..1bc4de2 100644
--- a/php-pecl-pq.spec
+++ b/php-pecl-pq.spec
@@ -39,14 +39,13 @@ Version: 1.1.1
%if 0%{?rcver:1}
Release: 0.1.%{rcver}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?rcver}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: postgresql-devel > 9
BuildRequires: %{?scl_prefix}php-devel > 5.4
BuildRequires: %{?scl_prefix}php-pear
@@ -159,8 +158,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make -C NTS install INSTALL_ROOT=%{buildroot}
# install config file
@@ -181,7 +178,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -202,9 +199,12 @@ fi
%check
+: ignore tests with erratic results
+rm ?TS/tests/cancel001.phpt
+
if ! pkg-config libpq --atleast-version=9.3; then
: ignore some tests only because of "diag" content
- rm ?TS/tests/{async003,async004,async005,async006,cancel001}.phpt
+ rm ?TS/tests/{async003,async004,async005,async006}.phpt
fi
OPT="-n"
@@ -279,7 +279,6 @@ rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license NTS/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -294,6 +293,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Aug 24 2018 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
+- F29 cleanup
+
* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
- update to 1.1.1 (php 5, stable)
- open https://github.com/m6w6/ext-pq/issues/19 failed tests