diff --git a/.gitignore b/.gitignore
index 93d3672..16b4a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-*~
+clog
package*.xml
/Net_SMTP-1.6.0.tgz
/Net_SMTP-1.6.1.tgz
/Net_SMTP-1.6.2.tgz
/Net_SMTP-1.6.3.tgz
+/Net_SMTP-1.7.0.tgz
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 539591c..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
---------------------------------------------------------------------
- The PHP License, version 3.01
- Copyright (c) 2002-2015 Jon Parise and Chuck Hagenbuch.
- 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
- ".
-
-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 .
-
-PHP includes the Zend Engine, freely available at
-.
diff --git a/php-pear-Net-SMTP.spec b/php-pear-Net-SMTP.spec
index 0759a08..87e55cb 100644
--- a/php-pear-Net-SMTP.spec
+++ b/php-pear-Net-SMTP.spec
@@ -11,7 +11,7 @@
%global pear_name Net_SMTP
Name: php-pear-Net-SMTP
-Version: 1.6.3
+Version: 1.7.0
Release: 1%{?dist}
Summary: Provides an implementation of the SMTP protocol
Summary(fr): Fournit une mise en Ĺ“uvre du protocole SMTP
@@ -20,22 +20,21 @@ Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/Net_SMTP
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-# https://github.com/pear/Net_SMTP/issues/18 - license clarification
-# https://github.com/pear/Net_SMTP/pull/17 - missing License
-Source1: https://raw.githubusercontent.com/pear/Net_SMTP/master/LICENSE
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear
-BuildRequires: php-xml
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-pcre
-Requires: php-openssl
+# From package.xml
+Requires: php(language) >= 5.4
Requires: php-pear(PEAR)
Requires: php-pear(Net_Socket)
Requires: php-pear(Auth_SASL)
+# From phpcompatinfo report for version 1.7.0
+Requires: php-pcre
+Requires: php-openssl
Provides: php-pear(%{pear_name}) = %{version}
Provides: php-composer(pear/net_smtp) = %{version}
@@ -77,8 +76,6 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
# Install XML package description
install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
-install -pm 644 %{SOURCE1} %{buildroot}%{pear_docdir}/%{pear_name}/LICENSE
-
%check
# Sanity check
@@ -87,7 +84,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
# For documentation purpose only
# After install, as root :
-# cd /usr/share/pear/test/Net_SMTP/tests
+# cd /usr/share/tests/pear/Net_SMTP/tests/
# cp config.php.dist config.php
# vi config.php # you should use a working mail account
# pear run-tests -p Net_SMTP
@@ -121,6 +118,10 @@ fi
%changelog
+* Mon Sep 6 2015 Remi Collet - 1.7.0-1
+- update to 1.7.0
+- raise minimum PHP version to 5.4
+
* Mon Aug 3 2015 Remi Collet - 1.6.3-1
- Version 1.6.3 (stable) - API 1.2.0 (stable)
- add composer provide
diff --git a/sources b/sources
index 5b35cbd..56b3abe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfe063580f8d41d9ad4a6fe350611ddb Net_SMTP-1.6.3.tgz
+8995182626b58f7c1c1e7524aed27fd6 Net_SMTP-1.7.0.tgz