From 767f713059eda3c3adf8f6776c26c2be1b6c0b38 Mon Sep 17 00:00:00 2001 From: xulchris Date: Jan 14 2007 22:37:20 +0000 Subject: upstream sync --- diff --git a/.cvsignore b/.cvsignore index 669435c..d4cd4cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Structures_DataGrid_Renderer_Smarty-0.1.2.tgz +Structures_DataGrid_Renderer_Smarty-0.1.3.tgz diff --git a/PHP-LICENSE-3.01 b/PHP-LICENSE-3.01 deleted file mode 100644 index 8d3fa07..0000000 --- a/PHP-LICENSE-3.01 +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - 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 - ". - -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-Structures-DataGrid-Renderer-Smarty.spec b/php-pear-Structures-DataGrid-Renderer-Smarty.spec index eb7a7c9..e17efb0 100644 --- a/php-pear-Structures-DataGrid-Renderer-Smarty.spec +++ b/php-pear-Structures-DataGrid-Renderer-Smarty.spec @@ -2,15 +2,14 @@ %define pear_name Structures_DataGrid_Renderer_Smarty Name: php-pear-Structures-DataGrid-Renderer-Smarty -Version: 0.1.2 -Release: 2%{?dist} +Version: 0.1.3 +Release: 1%{?dist} Summary: Renderer driver using Smarty Group: Development/Libraries -License: PHP License +License: BSD URL: http://pear.php.net/package/Structures_DataGrid_Renderer_Smarty 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 @@ -33,7 +32,6 @@ full-featured DataGrid within a Smarty template. %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} @@ -72,12 +70,15 @@ fi %files %defattr(-,root,root,-) -%doc LICENSE %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/Structures/DataGrid/Renderer/Smarty.php %changelog +* Sun Jan 14 2007 Christopher Stone 0.1.3-1 +- Upstream sync +- Relicense to BSD + * Sun Dec 03 2006 Christopher Stone 0.1.2-2 - Add license to %%doc - Add versioned Requires diff --git a/sources b/sources index c9bc7b1..ac33778 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5e209d09588b82c3e46b6f4d7fef242 Structures_DataGrid_Renderer_Smarty-0.1.2.tgz +1be63df00cf22b573725bf4cfaf75cef Structures_DataGrid_Renderer_Smarty-0.1.3.tgz