diff --git a/.gitignore b/.gitignore index 334b52f..fec2189 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ package-*.xml /DB_DataObject-1.11.0.tgz /DB_DataObject-1.11.1.tgz /DB_DataObject-1.11.2.tgz +/DB_DataObject-1.11.3.tgz 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 - ". - -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-DB-DataObject.spec b/php-pear-DB-DataObject.spec index 705b64a..1840ee8 100644 --- a/php-pear-DB-DataObject.spec +++ b/php-pear-DB-DataObject.spec @@ -1,19 +1,26 @@ +# spec file for php-phpunit-PHPUnit +# +# Copyright (c) 2010-2014 Remi Collet +# Copyright (c) 2006-2009 Christopher Stone +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please, preserve the changelog entries +# %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name DB_DataObject Name: php-pear-DB-DataObject -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.3 +Release: 1%{?dist} Summary: An SQL Builder, Object Interface to Database Tables Group: Development/Libraries License: PHP URL: http://pear.php.net/package/DB_DataObject Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -# https://pear.php.net/bugs/19884 - missing LICENSE file -Source1: http://www.php.net/license/3_01.txt -Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -51,10 +58,6 @@ your configuration files and your base classes. %prep %setup -qc -cp %{SOURCE1} LICENSE - -%{_bindir}/php %{SOURCE2} package.xml | tee CHANGELOG | head -n 2 - cd %{pear_name}-%{version} # package.xml is V2 mv ../package.xml %{name}.xml @@ -100,7 +103,6 @@ fi %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE %doc %{pear_docdir}/%{pear_name} %{_bindir}/createTables %{pear_xmldir}/%{name}.xml @@ -109,6 +111,10 @@ fi %changelog +* Tue Apr 22 2014 Remi Collet - 1.11.3 +- version 1.11.3 +- LICENSE now included in upstream archive + * Sun Aug 04 2013 Fedora Release Engineering - 1.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 3dfe697..55bdae9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d8bf2f83759068c9d3f490e8f564c8d DB_DataObject-1.11.2.tgz +8af451cb782fb4babc5220a5ad1296d5 DB_DataObject-1.11.3.tgz diff --git a/xml2changelog b/xml2changelog deleted file mode 100644 index 3a31be6..0000000 --- a/xml2changelog +++ /dev/null @@ -1,43 +0,0 @@ -= "2"){ // Package.xml V 2.0 - $new = ""; - if (strlen(trim($xml->notes))>1) { // Ignore too short descr. - printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", - $xml->version->release, $xml->stability->release, - $xml->version->api, $xml->stability->api, - $xml->date, $xml->notes); - $new=$xml->version->release; - } - - if (isset($xml->changelog->release) && count($xml->changelog->release)) { - $tab = array(); - foreach($xml->changelog->release as $rel) { - $old=$rel->version->release; - if ("$old" != "$new") { - $tab[''.$rel->date] = $rel; - } - } - krsort($tab); - foreach($tab as $rel) { - printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", - $rel->version->release, $rel->stability->release, - $rel->version->api, $rel->stability->api, - $rel->date, $rel->notes); - } - } -} else { // Package.xml V 1.0 - printf("* Version %s (%s) - %s\n\n%s\n\n", - $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); - - foreach($xml->changelog->release as $rel) - printf("* Version %s (%s) - %s\n\n%s\n\n", - $rel->version, $rel->state, $rel->date, $rel->notes); -} -?>