summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-05 08:09:42 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-05 08:09:42 +0200
commit70402f4dd3102cecfcd586ff7ae4c1af8c95770e (patch)
treef79f6cc8956bf09f4d0994e2ab1ff54e1e26f36e
parent297fa3a997b74a91776da4c0bf55fad34e936467 (diff)
php-pecl-gearman 0.8.3 and 1.0.3
-rw-r--r--Makefile2
-rw-r--r--php-pecl-gearman-dev.spec22
-rw-r--r--php-pecl-gearman.spec18
3 files changed, 30 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 1e65467..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../../common/Makefile
diff --git a/php-pecl-gearman-dev.spec b/php-pecl-gearman-dev.spec
index b59bcd2..165de19 100644
--- a/php-pecl-gearman-dev.spec
+++ b/php-pecl-gearman-dev.spec
@@ -4,8 +4,8 @@
Name: php-pecl-gearman
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
Summary: PHP wrapper to libgearman
Group: Development/Tools
@@ -15,19 +15,24 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, libgearman-devel > 0.21
+BuildRequires: libgearman-devel > 0.21
+BuildRequires: php-devel
BuildRequires: php-pear
# Required by phpize
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool
+%if 0%{?fedora} >= 17
# Temporary workaround for https://bugzilla.redhat.com/819209
-BuildRequires: libgearman-1.0
-BuildRequires: libgearman-1.0-devel
+BuildRequires: libgearman-1.0
+BuildRequires: libgearman-1.0-devel
+%endif
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
+Provides: php-pecl(%{pecl_name}) = %{version}
+
# RPM 4.8
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
@@ -54,6 +59,7 @@ cat >%{pecl_name}.ini <<EOF
extension=%{pecl_name}.so
EOF
+find %{pecl_name}-%{version} -type f -exec chmod -x {} \;
cp -pr %{pecl_name}-%{version} %{pecl_name}-%{version}-zts
@@ -124,6 +130,10 @@ fi
%changelog
+* Sun Aug 05 2012 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
+- update to 1.0.3
+- add missing provides php-pecl(gearman)
+
* Sat May 05 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-3
- add BR libgearman-1.0 + libgearman-1.0-devel
Workaround for https://bugzilla.redhat.com/819209
diff --git a/php-pecl-gearman.spec b/php-pecl-gearman.spec
index a981198..542e587 100644
--- a/php-pecl-gearman.spec
+++ b/php-pecl-gearman.spec
@@ -4,8 +4,8 @@
Name: php-pecl-gearman
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.8.3
+Release: 1%{?dist}
Summary: PHP wrapper to libgearman
Group: Development/Tools
@@ -15,16 +15,19 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, libgearman-devel > 0.10
+BuildRequires: libgearman-devel > 0.10
+BuildRequires: php-devel
BuildRequires: php-pear
# Required by phpize
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
-Requires(post): %{__pecl}
+Requires(post): %{__pecl}
Requires(postun): %{__pecl}
+Provides: php-pecl(%{pecl_name}) = %{version}
+
# RPM 4.8
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
@@ -51,6 +54,7 @@ cat >%{pecl_name}.ini <<EOF
extension=%{pecl_name}.so
EOF
+find %{pecl_name}-%{version} -type f -exec chmod -x {} \;
cp -pr %{pecl_name}-%{version} %{pecl_name}-%{version}-zts
@@ -122,6 +126,10 @@ fi
%changelog
+* Sun Aug 05 2012 Remi Collet <remi@fedoraproject.org> - 0.8.3-1
+- update to 0.8.3
+- add missing provides php-pecl(gearman)
+
* Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 0.8.1-2
- update to 0.8.1, build against php 5.4