rpms/php-pear-Image-GraphViz/F-8 PHP-LICENSE-3.01, 1.2, 1.3 php-pear-Image-GraphViz.spec, 1.2, 1.3 PHP-LICENSE-2.02, 1.1, NONE

Christopher Stone xulchris at fedoraproject.org
Thu Oct 23 21:28:29 UTC 2008


Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Image-GraphViz/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2968/F-8

Modified Files:
	php-pear-Image-GraphViz.spec 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
update license text


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	23 Oct 2008 21:27:59 -0000	1.3
@@ -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 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: php-pear-Image-GraphViz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Image-GraphViz/F-8/php-pear-Image-GraphViz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Image-GraphViz.spec	14 Jan 2007 20:41:37 -0000	1.2
+++ php-pear-Image-GraphViz.spec	23 Oct 2008 21:27:59 -0000	1.3
@@ -3,14 +3,14 @@
 
 Name:           php-pear-Image-GraphViz
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Interface to AT&T's GraphViz tools
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Image_GraphViz
 Source0:        http://pear.php.net/get/%{ClassName}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
 cd %{ClassName}-%{version}
@@ -47,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
@@ -75,6 +75,12 @@
 
 
 %changelog
+* Thu Oct 23 2008 Christopher Stone <chris.stone at gmail.com> 1.2.1-4
+- Update LICENSE to 3.01
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.1-3
+- fix license tag
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.2.1-2
 - Use correct version of PHP License
 


--- PHP-LICENSE-2.02 DELETED ---




More information about the fedora-extras-commits mailing list