[php-pecl-event/f20] update to 1.10.1 (stable)

Remi Collet remi at fedoraproject.org
Sun May 11 09:32:32 UTC 2014


commit a2a9f27e0fd750a86af56ea431569da8c3c6acfd
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun May 11 11:32:57 2014 +0200

    update to 1.10.1 (stable)

 .gitignore          |    1 +
 php-pecl-event.spec |   22 ++++++++++++++++------
 sources             |    2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d298c05..3570afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /event-1.9.1.tgz
+/event-1.10.1.tgz
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index 0958173..42be6c4 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -13,10 +13,17 @@
 %global with_tests  %{?_without_tests:0}%{!?_without_tests:1}
 %global pecl_name   event
 %global with_zts    0%{?__ztsphp:1}
+%if 0%{?fedora} < 21
+# After sockets.so
+%global ini_name  z-%{pecl_name}.ini
+%else
+# After 20-sockets.so
+%global ini_name  40-%{pecl_name}.ini
+%endif
 
 Summary:       Provides interface to libevent library
 Name:          php-pecl-%{pecl_name}
-Version:       1.9.1
+Version:       1.10.1
 Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
@@ -77,7 +84,7 @@ cp -pr NTS ZTS
 %endif
 
 # Drop in the bit of configuration
-cat > %{pecl_name}.ini << 'EOF'
+cat > %{ini_name} << 'EOF'
 ; Enable %{pecl_name} extension module
 extension = %{pecl_name}.so
 EOF
@@ -114,12 +121,12 @@ make %{?_smp_mflags}
 # use z-event.ini to ensure event.so load "after" sockets.so
 : Install the NTS stuff
 make -C NTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/z-%{pecl_name}.ini
+install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
 %if %{with_zts}
 : Install the ZTS stuff
 make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini
+install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 : Install the package XML file
@@ -189,16 +196,19 @@ fi
 %doc %{pecl_testdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
-%config(noreplace) %{php_inidir}/z-%{pecl_name}.ini
+%config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
 
 %if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/z-%{pecl_name}.ini
+%config(noreplace) %{php_ztsinidir}/%{ini_name}
 %{php_ztsextdir}/%{pecl_name}.so
 %endif
 
 
 %changelog
+* Sun May 11 2014 Remi Collet <remi at fedoraproject.org> - 1.10.1-1
+- Update to 1.10.1 (stable)
+
 * Sun Mar 23 2014 Remi Collet <remi at fedoraproject.org> - 1.9.1-1
 - Update to 1.9.1 (stable)
 
diff --git a/sources b/sources
index aabd506..99da0a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae53e45b3ad70335c8eaeba18dde1b6b  event-1.9.1.tgz
+4396eca6dd484c3c41c54f08b5203862  event-1.10.1.tgz


More information about the scm-commits mailing list