v2.4.0RC1

1 files changed, 21 insertions, 27 deletions

diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index f3e775a..0de0c05 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -3,12 +3,16 @@
 #
 # Fedora spec file for php-pecl-event
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
 %global sub_prefix   %{scl_prefix}
 %scl_package         php-pecl-event
@@ -26,19 +30,19 @@
 # After 20-sockets.so
 %global ini_name  40-%{pecl_name}.ini
 %endif
-#global prever    RC1
+%global upstream_version 2.4.0
+%global upstream_prever  RC1
 
 Summary:       Provides interface to libevent library
 Name:          %{?sub_prefix}php-pecl-%{pecl_name}
-Version:       2.3.0
-Release:       4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP
-Group:         Development/Languages
 URL:           http://pecl.php.net/package/event
-Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source0:       http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{?scl_prefix}php-devel > 5.4
+BuildRequires: %{?dtsprefix}gcc
+BuildRequires: %{?scl_prefix}php-devel
 BuildRequires: %{?scl_prefix}php-pear
 
 BuildRequires:  pkgconfig(libevent) >= 2
@@ -62,15 +66,6 @@ Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{relea
 %endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
@@ -118,15 +113,15 @@ sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 cd NTS
 
 # Sanity check, really often broken
 DIR=$(%{__php} -r 'echo "php" . PHP_MAJOR_VERSION;')
 extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' $DIR/php_event.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -173,7 +168,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 %{?dtsenable}
 
 # use z-event.ini to ensure event.so load "after" sockets.so
@@ -214,6 +208,8 @@ fi
 %endif
 
 %if %{with_tests}
+sed -e 's/SSLv3_SERVER_METHOD/TLS_SERVER_METHOD/' -i ?TS/tests/12-serialization.phpt
+
 cd NTS
 : Upstream test suite for NTS extension
 SKIP_ONLINE_TESTS=1 \
@@ -240,7 +236,7 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%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
@@ -260,12 +256,7 @@ fi
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -280,6 +271,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 23 2018 Remi Collet <remi@remirepo.net> - 2.4.0~RC1-1
+- update to 2.4.0RC1
+
 * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.3.0-4
 - rebuild for PHP 7.2.0beta1 new API