php-pecl-gearman: 1.1.1

2 files changed, 52 insertions, 204 deletions

diff --git a/php-pecl-gearman-dev.spec b/php-pecl-gearman-dev.spec
deleted file mode 100644
index 933a5a4..0000000
--- a/php-pecl-gearman-dev.spec
+++ /dev/null
@@ -1,198 +0,0 @@
-%{!?__pecl:	%{expand: %%global __pecl	%{_bindir}/pecl}}
-
-%global pecl_name gearman
-
-
-Name:		php-pecl-gearman
-Version:	1.0.3
-Release:	1%{?dist}.4
-Summary:	PHP wrapper to libgearman
-
-Group:		Development/Tools
-License:	PHP
-URL:		http://gearman.org
-Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	libgearman-devel > 0.21
-BuildRequires:	php-devel
-BuildRequires:	php-pear
-# Required by phpize
-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
-%endif
-
-Requires:	php(zend-abi) = %{php_zend_api}
-Requires:	php(api) = %{php_core_api}
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
-
-Provides:     php-%{pecl_name} = %{version}
-Provides:     php-%{pecl_name}%{?_isa} = %{version}
-Provides:     php-pecl(%{pecl_name}) = %{version}
-Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}
-
-# Other third party repo stuff
-Obsoletes:    php53-pecl-%{pecl_name}
-Obsoletes:    php53u-pecl-%{pecl_name}
-%if "%{php_version}" > "5.4"
-Obsoletes:    php54-pecl-%{pecl_name}
-%endif
-%if "%{php_version}" > "5.5"
-Obsoletes:    php55-pecl-%{pecl_name}
-%endif
-
-# Filter private shared
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-
-
-%description
-This extension uses libgearman library to provide API for
-communicating with gearmand, and writing clients and workers
-
-
-%prep
-%setup -q -c
-
-extver=$(sed -n '/#define PHP_GEARMAN_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_gearman.h)
-if test "x${extver}" != "x%{version}"; then
-   : Error: Upstream version is ${extver}, expecting %{version}.
-   exit 1
-fi
-
-cat >%{pecl_name}.ini <<EOF
-; enable %{pecl_name} extension
-extension=%{pecl_name}.so
-EOF
-
-find %{pecl_name}-%{version} -type f -exec chmod -x {} \;
-cp -pr %{pecl_name}-%{version} %{pecl_name}-%{version}-zts
-
-
-%build
-cd %{pecl_name}-%{version}
-%{_bindir}/phpize
-%configure  --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
-
-cd ../%{pecl_name}-%{version}-zts
-%{_bindir}/zts-phpize
-%configure  --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
-
-
-%install
-rm -rf %{buildroot}
-
-make -C %{pecl_name}-%{version} \
-     install INSTALL_ROOT=%{buildroot}
-
-make -C %{pecl_name}-%{version}-zts \
-     install INSTALL_ROOT=%{buildroot}
-
-# Install XML package description
-install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-# install config file
-install -Dpm644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini
-install -Dpm644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
-
-
-%check
-# simple module load test
-%{__php} --no-php-ini \
-    --define extension_dir=%{pecl_name}-%{version}/modules \
-    --define extension=%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%{__ztsphp} --no-php-ini \
-    --define extension_dir=%{pecl_name}-%{version}-zts/modules \
-    --define extension=%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%doc %{pecl_name}-%{version}/{ChangeLog,README,CREDITS,EXPERIMENTAL,LICENSE}
-%config(noreplace) %{php_inidir}/%{pecl_name}.ini
-%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini
-%{php_extdir}/%{pecl_name}.so
-%{php_ztsextdir}/%{pecl_name}.so
-%{pecl_xmldir}/%{name}.xml
-
-
-%changelog
-* Fri Nov 30 2012 Remi Collet <remi@fedoraproject.org> - 1.0.3-1.1
-- also provides php-gearman
-
-* 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
-
-* Tue Mar 06 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
-- update to 1.0.2 for PHP 5.4
-
-* Tue Mar 06 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- update to 1.0.2 for PHP 5.3
-- spec clean up
-
-* Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-2
-- update to 1.0.1, build against php 5.4
-
-* Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
-- update to 1.0.1
-
-* Mon Dec 05 2011 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
-- build against php 5.4
-
-* Mon Dec 05 2011 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
-- update to 1.0.0
-- raise dependency to libgearman 0.21 (si f16 only)
-
-* Mon Nov 14 2011 Remi Collet <remi@fedoraproject.org> - 0.8.0-2
-- build against php 5.4
-
-* Sat Oct 15 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.8.0-1
-- update to 0.8.0
-- ZTS extension
-- spec cleanup and minimal %%check
-- fix requires
-
-* Fri Aug 12 2011 Jesse Keating <jkeating@redhat.com> - 0.7.0-5
-- Rebuild for broken deps
-
-* Mon Apr 11 2011 Paul Whalen <paul.whalen@senecac.on.ca> 0.7.0-4
-- fix setup and package.xml install
-
-* Mon Apr 11 2011 Paul Whalen <paul.whalen@senecac.on.ca> 0.7.0-3
-- correct macros, add license to files
-
-* Fri Apr 08 2011 Paul Whalen <paul.whalen@senecac.on.ca> 0.7.0-2
-- correct package following pecl packaging guidelines
-
-* Fri Mar 11 2011 Paul Whalen <paul.whalen@senecac.on.ca> 0.7.0-1
-- Initial Packaging
-
diff --git a/php-pecl-gearman.spec b/php-pecl-gearman.spec
index 3a9087c..d7737d2 100644
--- a/php-pecl-gearman.spec
+++ b/php-pecl-gearman.spec
@@ -2,10 +2,23 @@
 
 %global pecl_name gearman
 
+%if 0%{?fedora} >= 12 && 0%{?fedora} <= 15
+%global extver 0.8.3
+%global libver 0.10
+%endif
+%if 0%{?fedora} >= 16 && 0%{?fedora} <= 18
+%global extver 1.0.3
+%global libver 0.21
+%endif
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 5
+%global extver 1.1.1
+%global libver 1.1.0
+%endif
+
 
 Name:		php-pecl-gearman
-Version:	0.8.3
-Release:	1%{?dist}.1
+Version:	%{extver}
+Release:	2%{?dist}.1
 Summary:	PHP wrapper to libgearman
 
 Group:		Development/Tools
@@ -15,7 +28,7 @@ Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgearman-devel > 0.10
+BuildRequires:	libgearman-devel > %{libver}
 BuildRequires:	php-devel
 BuildRequires:	php-pear
 # Required by phpize
@@ -34,9 +47,7 @@ Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}
 # Other third party repo stuff
 Obsoletes:    php53-pecl-%{pecl_name}
 Obsoletes:    php53u-pecl-%{pecl_name}
-%if "%{php_version}" > "5.4"
 Obsoletes:    php54-pecl-%{pecl_name}
-%endif
 %if "%{php_version}" > "5.5"
 Obsoletes:    php55-pecl-%{pecl_name}
 %endif
@@ -128,7 +139,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pecl_name}-%{version}/{ChangeLog,README,CREDITS,EXPERIMENTAL,LICENSE}
+%doc %{pecl_name}-%{version}/{ChangeLog,README,CREDITS,LICENSE}
 %config(noreplace) %{php_inidir}/%{pecl_name}.ini
 %config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
@@ -137,16 +148,51 @@ fi
 
 
 %changelog
+* Mon Aug 19 2013 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- single spec for 0.8.x / 1.0.x / 1.1.x
+- update to 1.1.1, requires libgearman >= 1.1.0
+
+* Fri Nov 30 2012 Remi Collet <remi@fedoraproject.org> - 1.0.3-1.1
+- also provides php-gearman
+
+* Sun Aug 05 2012 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
+- update to 1.0.3
+- add missing provides php-pecl(gearman)
+
 * Sun Aug 05 2012 Remi Collet <remi@fedoraproject.org> - 0.8.3-1
 - update to 0.8.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
+
+* Tue Mar 06 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
+- update to 1.0.2 for PHP 5.4
+
+* Tue Mar 06 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
+- update to 1.0.2 for PHP 5.3
+- spec clean up
+
+* Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-2
+- update to 1.0.1, build against php 5.4
+
+* Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
+- update to 1.0.1
+
 * Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 0.8.1-2
 - update to 0.8.1, build against php 5.4
 
 * Fri Dec 09 2011 Remi Collet <remi@fedoraproject.org> - 0.8.1-1
 - update to 0.8.1
 
+* Mon Dec 05 2011 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
+- build against php 5.4
+
+* Mon Dec 05 2011 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
+- update to 1.0.0
+- raise dependency to libgearman 0.21 (si f16 only)
+
 * Mon Nov 14 2011 Remi Collet <remi@fedoraproject.org> - 0.8.0-2
 - build against php 5.4