summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3_01.txt68
-rw-r--r--php-pear-Net-IMAP.spec37
2 files changed, 17 insertions, 88 deletions
diff --git a/3_01.txt b/3_01.txt
deleted file mode 100644
index 42536af..0000000
--- a/3_01.txt
+++ /dev/null
@@ -1,68 +0,0 @@
---------------------------------------------------------------------
- The PHP License, version 3.01
-Copyright (c) 1999 - 2012 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/php-pear-Net-IMAP.spec b/php-pear-Net-IMAP.spec
index 86dc4a0..41b3dfc 100644
--- a/php-pear-Net-IMAP.spec
+++ b/php-pear-Net-IMAP.spec
@@ -1,5 +1,12 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+# spec file for php-pear-Net-IMAP
+#
+# Copyright (c) 2013-2014 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear: %global __pear %{_bindir}/pear}
%global pear_channel pear.php.net
%global pear_name Net_IMAP
@@ -7,19 +14,14 @@
# Cannot run test suite which requires a valid IMAP account
Name: php-pear-Net-IMAP
-Version: 1.1.2
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
Summary: Provides an implementation of the IMAP protocol
Group: Development/Libraries
-# https://pear.php.net/bugs/19875
-# tests/* are GPL
-# docs/* are PHP version 2
-# NET/* are PHP
License: GPLv2+ and PHP
URL: http://%{pear_channel}/package/%{pear_name}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-Source1: http://www.php.net/license/3_01.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,18 +46,10 @@ Net_Socket and the optional Auth_SASL class.
%prep
-# http://pear.php.net/bugs/19730
-%setup -q -c -T
-tar xif %{SOURCE0}
-
-cp %{SOURCE1} LICENSE
+%setup -q -c
cd %{pear_name}-%{version}
-# https://pear.php.net/bugs/19876
-sed -e '/README/s/role="data"/role="doc"/' \
- -e '/docs/s/role="test"/role="doc"/' \
- -e '/phpunit.xml/s/role="data"/role="test"/' \
- ../package.xml >%{name}.xml
+cp ../package.xml %{name}.xml
%build
@@ -93,14 +87,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc LICENSE
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Net/IMAP*
%{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
%changelog
+* Tue Apr 01 2014 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3
+
* Wed Apr 3 2013 Remi Collet <remi@fedoraproject.org> - 1.1.2-2
- fix license, from review comment #929214