diff options
| -rw-r--r-- | 3_01.txt | 68 | ||||
| -rw-r--r-- | geoip-tests.patch | 25 | ||||
| -rw-r--r-- | php-pecl-geoip.spec | 18 |
3 files changed, 6 insertions, 105 deletions
diff --git a/3_01.txt b/3_01.txt deleted file mode 100644 index 6059c80..0000000 --- a/3_01.txt +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2014 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 software, freely available from - <http://www.php.net/software/>". - -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 <http://www.php.net>. - -PHP includes the Zend Engine, freely available at -<http://www.zend.com>. diff --git a/geoip-tests.patch b/geoip-tests.patch deleted file mode 100644 index 335568b..0000000 --- a/geoip-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: tests/014.phpt -=================================================================== ---- tests/014.phpt (revision 311865) -+++ tests/014.phpt (working copy) -@@ -7,17 +7,15 @@ - --FILE-- - <?php - --var_dump(geoip_time_zone_by_country_and_region('CA','')); --var_dump(geoip_time_zone_by_country_and_region('CA',NULL)); --var_dump(geoip_time_zone_by_country_and_region('CA')); -+var_dump(geoip_time_zone_by_country_and_region('CA','AB')); -+var_dump(geoip_time_zone_by_country_and_region('CM',NULL)); - var_dump(geoip_time_zone_by_country_and_region(NULL,'')); - var_dump(geoip_time_zone_by_country_and_region(NULL,NULL)); - - ?> - --EXPECTF-- - string(%d) "America/%s" --string(%d) "America/%s" --string(%d) "America/%s" -+string(%d) "Africa/Lagos" - - Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d - bool(false) diff --git a/php-pecl-geoip.spec b/php-pecl-geoip.spec index 85818d1..6d3acf7 100644 --- a/php-pecl-geoip.spec +++ b/php-pecl-geoip.spec @@ -13,21 +13,14 @@ Name: %{?scl_prefix}php-pecl-geoip -Version: 1.0.8 -Release: 8%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.1.0 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Extension to map IP addresses to geographic places Group: Development/Languages License: PHP URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# https://bugs.php.net/59804 -Patch1: geoip-tests.patch - -# https://bugs.php.net/65859 - Please Provides LICENSE file -# URL from geopip.c header -Source1: http://www.php.net/license/3_01.txt - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GeoIP-devel BuildRequires: %{?scl_prefix}php-devel @@ -78,8 +71,6 @@ database mv %{pecl_name}-%{version} NTS cd NTS -cp %{SOURCE1} LICENSE -%patch1 -p0 -b .tests extver=$(sed -n '/#define PHP_GEOIP_VERSION/{s/.* "//;s/".*$//;p}' php_geoip.h) if test "x${extver}" != "x%{version}"; then @@ -132,7 +123,7 @@ install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i done -for i in LICENSE $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') +for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -187,6 +178,9 @@ fi %changelog +* Sat May 03 2014 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 +- Update to 1.1.0 (beta) + * Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 1.0.8-8 - add numerical prefix to extension configuration file |