summaryrefslogtreecommitdiffstats
path: root/php-pecl-rrd.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-rrd.spec')
-rw-r--r--php-pecl-rrd.spec21
1 files changed, 13 insertions, 8 deletions
diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 3993d63..96fa787 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -23,7 +23,7 @@
Summary: PHP Bindings for rrdtool
Name: %{?scl_prefix}php-pecl-rrd
Version: 1.1.3
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/rrd
@@ -47,16 +47,19 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?pre}
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}%{?pre}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?pre}
-
-%if 0%{!?scl:1}
+%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
-%if "%{php_version}" > "5.4"
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
Obsoletes: php54-pecl-%{pecl_name}
-%endif
+Obsoletes: php54w-pecl-%{pecl_name}
%if "%{php_version}" > "5.5"
Obsoletes: php55u-pecl-%{pecl_name}
+Obsoletes: php55w-pecl-%{pecl_name}
+%endif
+%if "%{php_version}" > "5.6"
+Obsoletes: php56u-pecl-%{pecl_name}
+Obsoletes: php56w-pecl-%{pecl_name}
%endif
%endif
@@ -146,9 +149,8 @@ cd NTS
make -C tests/data clean
make -C tests/data all
-make test NO_INTERACTION=1 | tee rpmtests.log
-
-if grep -q "FAILED TEST" rpmtests.log; then
+if ! make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1
+then
for t in tests/*diff; do
echo "*** FAILED: $(basename $t .diff)"
diff -u tests/$(basename $t .diff).exp tests/$(basename $t .diff).out || :
@@ -187,6 +189,9 @@ fi
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.3-3
+- improve SCL build
+
* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.1.3-2
- add numerical prefix to extension configuration file (php 5.6)