rpms/php-pear-XML-Util/FC-5 PHP-LICENSE-3.01, NONE, 1.1 .cvsignore, 1.2, 1.3 php-pear-XML-Util.spec, 1.1, 1.2 sources, 1.2, 1.3

Sat Dec 2 21:50:31 UTC 2006

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29997/FC-5

Modified Files:
	.cvsignore php-pear-XML-Util.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Log Message:
upstream sync

--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  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 at 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 at 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 at 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>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Oct 2006 03:02:27 -0000	1.2
+++ .cvsignore	2 Dec 2006 21:50:01 -0000	1.3
@@ -1 +1 @@
-XML_Util-1.1.1.tgz
+XML_Util-1.1.2.tgz


Index: php-pear-XML-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/FC-5/php-pear-XML-Util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-XML-Util.spec	17 Oct 2006 03:02:27 -0000	1.1
+++ php-pear-XML-Util.spec	2 Dec 2006 21:50:01 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name XML_Util
 
 Name:           php-pear-XML-Util
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        XML utility class
 
@@ -10,10 +10,11 @@
 License:        PHP License
 URL:            http://pear.php.net/package/XML_Util
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+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 dos2unix
+BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -35,6 +36,7 @@
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+install -pm 644 -c %{SOURCE1} LICENSE
 cd %{pear_name}-%{version}
 
 
@@ -53,7 +55,7 @@
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
 
 # Fix end of line encoding
-dos2unix docdir/%{pear_name}/examples/example*.php
+sed -i 's/\r//' docdir/%{pear_name}/examples/example*.php
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,10 +83,16 @@
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc LICENSE
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/XML/Util.php
 
 
 %changelog
-* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.1.1-1
+* Sat Dec 02 2006 Christopher Stone <chris.stone at gmail.com> 1.1.2-1
+- Upstream sync
+- Add php license to %%doc
+- Replace dos2unix with sed
+
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 1.1.1-1
 - Initial release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Oct 2006 03:02:27 -0000	1.2
+++ sources	2 Dec 2006 21:50:01 -0000	1.3
@@ -1 +1 @@
-528278996240d47a07e4273fb7bde841  XML_Util-1.1.1.tgz
+b84ca2a5fd0b54a0c93d8123970c7c42  XML_Util-1.1.2.tgz


