Author: oden
Date: Sun Nov 12 14:00:32 2006
New Revision: 83419
Added:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.1.tar.bz2
(contents, props changed)
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-html_treemenu_includes_fix.diff
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-includes_fix.diff
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-smarty.diff
Removed:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.0RC5-html_treemenu_includes_fix.diff
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.0RC5-includes_fix.diff
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.0RC5-smarty.diff
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.0RC5.tar.bz2
Modified:
packages/cooker/php-pear-PhpDocumentor/current/SPECS/php-pear-PhpDocumentor.spec
Log:
- 1.3.1
- fix deps
- rediffed patches; P0,P1,P3
Added:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-1.3.1.tar.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-html_treemenu_includes_fix.diff
==============================================================================
--- (empty file)
+++
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-html_treemenu_includes_fix.diff
Sun Nov 12 14:00:32 2006
@@ -0,0 +1,80 @@
+diff -Naur PhpDocumentor-1.3.1/docbuilder/file_dialog.php
PhpDocumentor-1.3.1.oden/docbuilder/file_dialog.php
+--- PhpDocumentor-1.3.1/docbuilder/file_dialog.php 2006-10-24
22:19:33.000000000 -0400
++++ PhpDocumentor-1.3.1.oden/docbuilder/file_dialog.php 2006-11-12
06:30:19.000000000 -0500
+@@ -46,7 +46,7 @@
+ * common file information
+ */
+ require_once 'PhpDocumentor/phpDocumentor/common.inc.php';
+- require_once 'PhpDocumentor/HTML_TreeMenu-1.1.2/TreeMenu.php';
++ require_once 'HTML/TreeMenu.php';
+ require_once( '@WEB-DIR@' . PATH_DELIMITER .
'PhpDocumentor/docbuilder/includes/utilities.php' );
+
+ $root_dir = 'PhpDocumentor';
+@@ -68,7 +68,7 @@
+ * common file information
+ */
+ include_once("$root_dir/phpDocumentor/common.inc.php");
+- include_once("$root_dir/HTML_TreeMenu-1.1.2/TreeMenu.php");
++ include_once("HTML/TreeMenu.php");
+ include_once("$root_dir/docbuilder/includes/utilities.php" );
+
+ // set up include path so we can find all files, no matter what
+@@ -117,7 +117,7 @@
+ }
+ </style>
+
+- <script src="../HTML_TreeMenu-1.1.2/TreeMenu.js" language="JavaScript"
type="text/javascript"></script>
++ <script src="HTML/TreeMenu/TreeMenu.js" language="JavaScript"
type="text/javascript"></script>
+
+ <?php
+ set_time_limit(0); // six minute timeout
+@@ -172,11 +172,11 @@
+ if ('@WEB-DIR@' != '@'.'WEB-DIR@')
+ {
+ $DHTMLmenu = &new HTML_TreeMenu_DHTML($menu,
+- array('images' => '../HTML_TreeMenu-1.1.2/images'));
++ array('images' => 'HTML/TreeMenu/images'));
+ } else {
+ $DHTMLmenu = &new HTML_TreeMenu_DHTML($menu,
+ array('images' =>
str_replace('/docbuilder/file_dialog.php','',$_SERVER['PHP_SELF']) .
+- '/HTML_TreeMenu-1.1.2/images'));
++ '/HTML/TreeMenu/images'));
+ }
+ ?>
+ <script type="text/javascript" language="Javascript">
+diff -Naur PhpDocumentor-1.3.1/docbuilder/includes/utilities.php
PhpDocumentor-1.3.1.oden/docbuilder/includes/utilities.php
+--- PhpDocumentor-1.3.1/docbuilder/includes/utilities.php 2006-10-24
22:19:33.000000000 -0400
++++ PhpDocumentor-1.3.1.oden/docbuilder/includes/utilities.php 2006-11-12
06:31:20.000000000 -0500
+@@ -33,7 +33,7 @@
+
+ if ('@DATA-DIR@' != '@'.'DATA-DIR@')
+ {
+- include_once('PhpDocumentor/HTML_TreeMenu-1.1.2/TreeMenu.php');
++ include_once('HTML/TreeMenu.php');
+ } else {
+
include_once(dirname(realpath(__FILE__))."/../../HTML_TreeMenu-1.1.2/TreeMenu.php");
+ }
+diff -Naur PhpDocumentor-1.3.1/new_phpdoc.php
PhpDocumentor-1.3.1.oden/new_phpdoc.php
+--- PhpDocumentor-1.3.1/new_phpdoc.php 2006-10-24 22:19:33.000000000 -0400
++++ PhpDocumentor-1.3.1.oden/new_phpdoc.php 2006-11-12 06:29:38.000000000
-0500
+@@ -71,9 +71,9 @@
+ <?php
+ if(!isset($_GET['submit']) || !empty($_REQUEST['altuserdir'])) {
+ ?>
+-<script src="HTML_TreeMenu-1.1.2/TreeMenu.js" language="JavaScript"
type="text/javascript"></script>
++<script src="HTML/TreeMenu/TreeMenu.js" language="JavaScript"
type="text/javascript"></script>
+ <?php
+- include_once('HTML_TreeMenu-1.1.2/TreeMenu.php');
++ include_once('HTML/TreeMenu.php');
+ set_time_limit(0); // six minute timeout
+ ini_set("memory_limit","256M");
+ /**
+@@ -265,7 +265,7 @@
+ $node->addItem($anode);
+ };
+ $menu->addItem($node);
+- $DHTMLmenu = &new HTML_TreeMenu_DHTML($menu, array('images' =>
'HTML_TreeMenu-1.1.2/images'));
++ $DHTMLmenu = &new HTML/TreeMenu_DHTML($menu, array('images' =>
'HTML/TreeMenu/images'));
+ ?>
+ <script type="text/javascript" language="Javascript">
+ /**
Added:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-includes_fix.diff
==============================================================================
--- (empty file)
+++
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-includes_fix.diff
Sun Nov 12 14:00:32 2006
@@ -0,0 +1,12 @@
+diff -Naur PhpDocumentor-1.3.1/new_phpdoc.php
PhpDocumentor-1.3.1.oden/new_phpdoc.php
+--- PhpDocumentor-1.3.1/new_phpdoc.php 2006-11-12 06:33:29.000000000 -0500
++++ PhpDocumentor-1.3.1.oden/new_phpdoc.php 2006-11-12 06:34:53.000000000
-0500
+@@ -51,7 +51,7 @@
+ /**
+ * common file information
+ */
+-include_once("phpDocumentor/common.inc.php");
++include_once("PhpDocumentor/phpDocumentor/common.inc.php");
+
+ // find the .ini directory by parsing phpDocumentor.ini and extracting
_phpDocumentor_options[userdir]
+ $ini = phpDocumentor_parse_ini_file($_phpDocumentor_install_dir .
PATH_DELIMITER . 'phpDocumentor.ini', true);
Added:
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-smarty.diff
==============================================================================
--- (empty file)
+++
packages/cooker/php-pear-PhpDocumentor/current/SOURCES/PhpDocumentor-smarty.diff
Sun Nov 12 14:00:32 2006
@@ -0,0 +1,57 @@
+diff -Naur PhpDocumentor-1.3.1/phpDocumentor/Converter.inc
PhpDocumentor-1.3.1.oden/phpDocumentor/Converter.inc
+--- PhpDocumentor-1.3.1/phpDocumentor/Converter.inc 2006-10-24
22:19:33.000000000 -0400
++++ PhpDocumentor-1.3.1.oden/phpDocumentor/Converter.inc 2006-11-12
06:38:58.000000000 -0500
+@@ -41,7 +41,7 @@
+ /**
+ * Smarty template files
+ */
+-include_once("phpDocumentor/Smarty-2.6.0/libs/Smarty.class.php");
++include_once("Smarty.class.php");
+ /**
+ * Base class for all output converters.
+ *
+@@ -5021,7 +5021,7 @@
+ $this->_compiledDir[$this->targetDir . DIRECTORY_SEPARATOR .
md5($templatename)] = 1;
+ mkdir($this->targetDir . DIRECTORY_SEPARATOR .
md5($templatename),0775);
+ }
+- $templ->compile_dir = realpath($this->targetDir . PATH_DELIMITER .
md5($templatename));
++ $templ->compile_dir = '/var/cache/httpd/php-pear-PhpDocumentor';
+ $templ->config_dir = realpath($this->smarty_dir . PATH_DELIMITER .
'configs');
+ $templ->assign("date",date("r",time()));
+ $templ->assign("maintitle",$this->title);
+diff -Naur
PhpDocumentor-1.3.1/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
PhpDocumentor-1.3.1.oden/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
+---
PhpDocumentor-1.3.1/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
2006-10-24 22:19:33.000000000 -0400
++++
PhpDocumentor-1.3.1.oden/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
2006-11-12 06:36:37.000000000 -0500
+@@ -1079,7 +1079,7 @@
+ {
+ $this->page_summary = new Smarty;
+ $this->page_summary->template_dir = $this->smarty_dir .
PATH_DELIMITER . 'templates';
+- $this->page_summary->compile_dir = $this->smarty_dir .
PATH_DELIMITER . 'templates_c';
++ $this->page_summary->compile_dir =
'/var/cache/httpd/php-pear-PhpDocumentor';
+ $this->page_summary->config_dir = $this->smarty_dir .
PATH_DELIMITER . 'configs';
+ // registering stuff on the template
+
$this->page_summary->assign("source_location",$element->parent->getSourceLocation($this,$this->template_options['usepear']));
+diff -Naur PhpDocumentor-1.3.1/user/default.ini
PhpDocumentor-1.3.1.oden/user/default.ini
+--- PhpDocumentor-1.3.1/user/default.ini 2006-10-24 22:19:33.000000000
-0400
++++ PhpDocumentor-1.3.1.oden/user/default.ini 2006-11-12 06:42:10.000000000
-0500
+@@ -82,7 +82,7 @@
+ ;; comma-separated list of files, directories or wildcards ? and * (any
wildcard) to ignore
+ ;; legal values: any wildcard strings separated by commas
+ ;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
+-ignore = pear-*,templates/,Documentation/,test*.php,Lexer.inc
++ignore =
/var/cache/httpd/php-pear-PhpDocumentor/,pear-*,templates/,Documentation/,test*.php,Lexer.inc
+
+ ;; comma-separated list of Converters to use in
outputformat:Convertername:templatedirectory format
+ ;; legal values:
HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
+diff -Naur PhpDocumentor-1.3.1/user/demo.ini
PhpDocumentor-1.3.1.oden/user/demo.ini
+--- PhpDocumentor-1.3.1/user/demo.ini 2006-10-24 22:19:33.000000000 -0400
++++ PhpDocumentor-1.3.1.oden/user/demo.ini 2006-11-12 06:36:37.000000000
-0500
+@@ -69,7 +69,7 @@
+ ;; comma-separated list of files, directories or wildcards ? and * (any
wildcard) to ignore
+ ;; legal values: any wildcard strings separated by commas
+ ;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
+-ignore = templates_c/,*HTML/default/*,spec/
++ignore = /var/cache/httpd/php-pear-PhpDocumentor/,*HTML/default/*,spec/
+
+ ;; comma-separated list of Converters to use in
outputformat:Convertername:templatedirectory format
+ ;; legal values:
HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib
Modified:
packages/cooker/php-pear-PhpDocumentor/current/SPECS/php-pear-PhpDocumentor.spec
==============================================================================
---
packages/cooker/php-pear-PhpDocumentor/current/SPECS/php-pear-PhpDocumentor.spec
(original)
+++
packages/cooker/php-pear-PhpDocumentor/current/SPECS/php-pear-PhpDocumentor.spec
Sun Nov 12 14:00:32 2006
@@ -7,15 +7,15 @@
Summary: %{_pearname} - provides automatic documenting of PHP API
directly from source
Name: php-pear-%{_pearname}
-Version: 1.3.0
-Release: %mkrel 1.RC5.3
-License: PHP License
+Version: 1.3.1
+Release: %mkrel 1
+License: LGPL
Group: Development/PHP
URL: http://pear.php.net/package/PhpDocumentor/
-Source0: http://pear.php.net/get/%{_pearname}-%{version}RC5.tar.bz2
-Patch0: PhpDocumentor-1.3.0RC5-html_treemenu_includes_fix.diff
-Patch1: PhpDocumentor-1.3.0RC5-includes_fix.diff
-Patch2: PhpDocumentor-1.3.0RC5-smarty.diff
+Source0: http://pear.php.net/get/%{_pearname}-%{version}.tar.bz2
+Patch0: PhpDocumentor-html_treemenu_includes_fix.diff
+Patch1: PhpDocumentor-includes_fix.diff
+Patch2: PhpDocumentor-smarty.diff
Requires(post): php-pear
Requires(preun): php-pear
Requires: apache-mod_php
@@ -23,6 +23,7 @@
Requires: php-smarty
BuildArch: noarch
BuildRequires: dos2unix
+BuildRequires: php-pear
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description
@@ -120,21 +121,20 @@
mv %{buildroot}%{_datadir}/pear/docs/PhpDocumentor docs
# put this file in place
-mv %{buildroot}%{_bindir}/PhpDocumentor/scripts/makedoc.sh
%{buildroot}%{_datadir}/pear/PhpDocumentor/scripts/
+mv %{buildroot}%{_bindir}/scripts/makedoc.sh
%{buildroot}%{_datadir}/pear/PhpDocumentor/scripts/
# fix apache conf on the fly
cat > apache-%{name}.conf << EOF
php_value include_path '.:%{_datadir}/pear:%{_datadir}/smarty'
Alias /PhpDocumentor "%{_datadir}/pear/data/PhpDocumentor"
-#Alias /HTML_TreeMenu "%{_datadir}/pear/HTML_TreeMenu"
-
<Directory "%{_datadir}/pear/data/PhpDocumentor/">
Options FollowSymLinks Indexes
AllowOverride None
Order Deny,Allow
</Directory>
+#Alias /HTML_TreeMenu "%{_datadir}/pear/HTML_TreeMenu"
#<Directory "%{_datadir}/pear/HTML_TreeMenu/">
# Options FollowSymLinks Indexes
# AllowOverride None
@@ -169,6 +169,7 @@
rm -rf %{buildroot}%{_datadir}/pear/data/PhpDocumentor/phpDocumentor/Smarty-*
rm -rf %{buildroot}%{_datadir}/pear/PhpDocumentor/phpDocumentor/Smarty-*
rm -rf %{buildroot}%{_datadir}/pear/PhpDocumentor/HTML_TreeMenu-*
+rm -f %{buildroot}/var/cache/pear/*
%post
if [ "$1" = "1" ]; then
