summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-event-dev.spec20
-rw-r--r--php-pecl-event.spec18
2 files changed, 27 insertions, 11 deletions
diff --git a/php-pecl-event-dev.spec b/php-pecl-event-dev.spec
index 9445354..057d818 100644
--- a/php-pecl-event-dev.spec
+++ b/php-pecl-event-dev.spec
@@ -17,16 +17,13 @@
Summary: Provides interface to libevent library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 1.9.0
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version: 1.9.1
+Release: 1%{?dist}%{!?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}.tgz
-# https://bitbucket.org/osmanov/pecl-event/pull-request/7
-Patch0: %{pecl_name}-php56.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel > 5.4
BuildRequires: %{?scl_prefix}php-pear
@@ -50,16 +47,17 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if 0%{!?scl:1}
-%if "%{php_version}" > "5.4"
+%if "%{?vendor}" == "Remi Collet"
# Other third party repo stuff
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
Obsoletes: php54-pecl-%{pecl_name}
-%endif
%if "%{php_version}" > "5.5"
Obsoletes: php55u-pecl-%{pecl_name}
%endif
+%if "%{php_version}" > "5.6"
+Obsoletes: php56u-pecl-%{pecl_name}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -83,9 +81,8 @@ Version 1.0.0 introduces:
%setup -q -c
mv %{pecl_name}-%{version} NTS
-cd NTS
-%patch0 -p1 -b .php56
+cd NTS
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' php_event.h)
if test "x${extver}" != "x%{version}"; then
@@ -229,6 +226,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Mar 23 2014 Remi Collet <remi@fedoraproject.org> - 1.9.1-1
+- Update to 1.9.1 (stable)
+
* Sun Mar 23 2014 Remi Collet <remi@fedoraproject.org> - 1.9.0-2
- add patch for php 5.6
https://bitbucket.org/osmanov/pecl-event/pull-request/7
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index 2285d15..0958173 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -16,7 +16,7 @@
Summary: Provides interface to libevent library
Name: php-pecl-%{pecl_name}
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
License: PHP
Group: Development/Languages
@@ -62,6 +62,15 @@ Version 1.0.0 introduces:
mv %{pecl_name}-%{version} NTS
+cd NTS
+# Sanity check, really often broken
+extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' php_event.h)
+if test "x${extver}" != "x%{version}"; then
+ : Error: Upstream extension version is ${extver}, expecting %{version}.
+ exit 1
+fi
+cd ..
+
# duplicate for ZTS build
%if %{with_zts}
cp -pr NTS ZTS
@@ -190,6 +199,13 @@ fi
%changelog
+* Sun Mar 23 2014 Remi Collet <remi@fedoraproject.org> - 1.9.1-1
+- Update to 1.9.1 (stable)
+
+* Sun Mar 23 2014 Remi Collet <remi@fedoraproject.org> - 1.9.0-2
+- add patch for php 5.6
+ https://bitbucket.org/osmanov/pecl-event/pull-request/7
+
* Fri Jan 17 2014 Remi Collet <remi@fedoraproject.org> - 1.9.0-1
- Update to 1.9.0 (stable)
- add option to disable tests during build