php-pear-Auth: sync with rawhide

2 files changed, 104 insertions, 17 deletions

diff --git a/PHP-LICENSE-3.01 b/PHP-LICENSE-3.01
new file mode 100644
index 0000000..8d3fa07
--- /dev/null
+++ b/PHP-LICENSE-3.01
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+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 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-Auth.spec b/php-pear-Auth.spec
index 59b9882..3cd5de9 100644
--- a/php-pear-Auth.spec
+++ b/php-pear-Auth.spec
@@ -3,22 +3,26 @@
 
 Name:           php-pear-Auth
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Authentication provider for PHP
 Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/Auth
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-#Patch0:         %{name}-1.6.1-md5sum.patch
+# https://pear.php.net/bugs/19805
+Source1:        PHP-LICENSE-3.01
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 
-Provides:        php-pear(%{pear_name}) = %{version}
 Requires:        php-pear(Net_POP3) >= 1.3.0
 Requires:        php-imap
 Requires:        php-ldap
+Requires:        php-pcre
+Requires:        php-session
 Requires:        php-soap
+Requires:        php-xml
 Requires:        php-pear(DB) >= 1.6.0
 Requires:        php-pear(File_Passwd) >= 1.1.0
 Requires:        php-pear(HTTP_Client) >= 1.1.0
@@ -27,6 +31,8 @@ Requires:        php-pear(Net_POP3) >= 1.3.0
 Requires:        php-pear(MDB2) >= 2.0
 Requires:        php-pear(SOAP) >= 0.9.0
 
+Provides:        php-pear(%{pear_name}) = %{version}
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -52,38 +58,39 @@ Requires:       %{name} = %{version}-%{release}
 %description radius
 This package adds a RADIUS container for the PHP Auth system.
 
+
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-cd %{pear_name}-%{version}
 
-# Fix end of line encodings
-# %patch0 -p0 -b .md5sum
-%{__sed} -i 's/\r//' README.Auth
+cp %{SOURCE1} LICENSE
 
+cd %{pear_name}-%{version}
+
+# https://pear.php.net/bugs/19806
 sed -e '/md5.js/s/role="data"/role="php"/' \
-    -i %{pear_name}.xml
+    ../package.xml >%{pear_name}.xml
 
 
 %build
 cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
+
 %install
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT
-%{__pear} install --offline --nodeps --installroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --force --nodeps --installroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -99,6 +106,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSE
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/%{pear_name}*
@@ -114,7 +122,18 @@ fi
 %defattr(-,root,root,-)
 %{pear_phpdir}/%{pear_name}/Container/RADIUS.php
 
+
 %changelog
+* Tue Jan 29 2013 Remi Collet <rpms@fedoraproject.org> - 1.6.4-2
+- rebuild
+
+* Tue Jan 29 2013 Remi Collet <remi@fedoraproject.org> - 1.6.4-1
+- Updated to 1.6.2 (stable), API 1.5.0 (stable)
+- add link to upstream bugs
+  https://pear.php.net/bugs/19805 : missing LICENSE
+  https://pear.php.net/bugs/19806 : md5.js
+- doc in /usr/share/doc/pear
+
 * Tue Aug 21 2012 Remi Collet <remi@fedoraproject.org> - 1.6.4-1
 - update to 1.6.4 for remi repo
 - move doc to /usr/share/doc/pear