From 159a62c59d7c8e8530521a87074c04732152b505 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 8 Sep 2012 08:07:39 +0200 Subject: php-pecl-memcache: Obsoletes php53*, php54* on EL --- LICENSE | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ php-pecl-memcache.spec | 28 +++++++++++++++------ 2 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6c1c170 --- /dev/null +++ b/LICENSE @@ -0,0 +1,68 @@ +-------------------------------------------------------------------- + The PHP License, version 3.0 +Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. +-------------------------------------------------------------------- + +Redistribution and use in source and binary forms, with or without +modification, is permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The name "PHP" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact group@php.net. + + 4. Products derived from this software may not be called "PHP", nor + may "PHP" appear in their name, without prior written permission + from group@php.net. You may indicate that your software works in + conjunction with PHP by saying "Foo for PHP" instead of calling + it "PHP Foo" or "phpfoo" + + 5. The PHP Group may publish revised and/or new versions of the + license from time to time. Each version will be given a + distinguishing version number. + Once covered code has been published under a particular version + of the license, you may always continue to use it under the terms + of that version. You may also choose to use such covered code + under the terms of any subsequent version of the license + published by the PHP Group. No one other than the PHP Group has + the right to modify the terms applicable to covered code created + under this License. + + 6. Redistributions of any form whatsoever must retain the following + acknowledgment: + "This product includes PHP, freely available from + ". + +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP +DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- + +This software consists of voluntary contributions made by many +individuals on behalf of the PHP Group. + +The PHP Group can be contacted via Email at group@php.net. + +For more information on the PHP Group and the PHP project, +please see . + +This product includes the Zend Engine, freely available at +. diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index 33eb265..4d7d904 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -1,18 +1,18 @@ %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} -%{!?php_extdir: %{expand: %%global php_extdir %(%{phpbindir}/php-config --extension-dir)}} %global pecl_name memcache Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcache Version: 3.0.6 -Release: 4%{?dist} +Release: 5%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source2: xml2changelog +Source3: LICENSE # https://bugs.php.net/60284 Patch0: memcache-php54.patch @@ -27,14 +27,20 @@ Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} -Provides: php-pecl(%{pecl_name}) = %{version}-%{release} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{_isa} = %{version} +# Other third party repo stuff +Obsoletes: php53-pecl-memcache +Obsoletes: php53u-pecl-memcache +%if "%{php_version}" > "5.4" +Obsoletes: php54-pecl-memcache +%endif -# RPM 4.8 + +# Filter private shared %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} %{?filter_setup} -# RPM 4.9 -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$ %description @@ -51,14 +57,16 @@ Memcache can be used as a PHP session handler. %prep %setup -c -q +%patch0 -p0 -b .php54 pushd memcache-%{version} -%patch0 -p1 -b .php54 %patch1 -p1 -b .fdcast %patch2 -p1 -b .get-mem-corrupt.patch popd %{__php} -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 5 +cp -p %{SOURCE3} . + cat >%{pecl_name}.ini << 'EOF' ; ----- Enable %{pecl_name} extension module extension=%{pecl_name}.so @@ -160,7 +168,7 @@ fi %files %defattr(-, root, root, -) -%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README +%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README LICENSE %doc %{pecl_name}-%{version}/example.php %{pecl_name}-%{version}/memcache.php %config(noreplace) %{php_inidir}/%{pecl_name}.ini %config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini @@ -170,6 +178,10 @@ fi %changelog +* Sat Sep 8 2012 Remi Collet - 3.0.6-5 +- add LICENSE +- Obsoletes php53*, php54* on EL + * Sat Jul 7 2012 Remi Collet - 3.0.6-4 - sync patch with rawhide -- cgit