SPECS: php-pear-PhpDocumentor.spec - updated 1.3.0RC3 from DEVEL. ...

glen glen at pld-linux.org
Thu Sep 29 21:58:17 CEST 2005 

Author: glen                         Date: Thu Sep 29 19:58:17 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated 1.3.0RC3 from DEVEL. this one at least works

---- Files affected:
SPECS:
   php-pear-PhpDocumentor.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PhpDocumentor.spec
diff -u SPECS/php-pear-PhpDocumentor.spec:1.11 SPECS/php-pear-PhpDocumentor.spec:1.12
--- SPECS/php-pear-PhpDocumentor.spec:1.11	Sat May  7 17:36:26 2005
+++ SPECS/php-pear-PhpDocumentor.spec	Thu Sep 29 21:58:12 2005
@@ -1,36 +1,40 @@
 # $Revision$, $Date$
-# ToDo:
+# TODO:
 # - solve requires issue (something like patch0, but a bit extended?)
 # - maybe PhpDocumentor.ini should go to /etc/php ?
-# - Requires: ... pear(@WEB-DIR@/PhpDocumentor/docbuilder/includes/utilities.php) 
-# - smarty plugins to /usr/share/pear/Smarty ?
+# - subpackage for -tutorial?
 %include	/usr/lib/rpm/macros.php
 %define		_class		PhpDocumentor
-%define		_status		stable
+%define		_status		beta
 %define		_pearname	%{_class}
 
 Summary:	%{_pearname} - provides automatic documenting of PHP API directly from source
 Summary(pl):	%{_pearname} - automatyczne tworzenie dokumentacji API PHP prosto ze źródeł
 Name:		php-pear-%{_pearname}
-Version:	1.2.2.1
-Release:	0.11
-License:	PHP 2.02
+Version:	1.3.0
+%define	_rc RC3
+Release:	0.%{_rc}.20
+License:	PHP 3.00
 Group:		Development/Languages/PHP
-Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	34276bfa0d59d5df11d84ec38896c34a
+Source0:	http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz
+# Source0-md5:	d96ccefa7cfce8b0f24216b8f5041ba4
 Patch0:		%{name}-includes_fix.patch
 Patch1:		%{name}-html_treemenu_includes_fix.patch
+Patch2:		%{name}-smarty.patch
 URL:		http://pear.php.net/package/PhpDocumentor/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
-BuildRequires:	sed >= 4.0
-Requires:	php-pear
+BuildRequires:	rpm-php-pearprov >= 4.4.2-10.2
+Requires:	php-pear >= 4:1.0-2.8
 Requires:	php-cli
 Requires:	php-pcre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# dunno, i need this package NOW
-%define		_noautoreq	'pear(@WEB-DIR at .*)' 'pear(phpDocumentor/.*)'
+%define		_smartyplugindir	%{php_pear_dir}/Smarty/plugins
+
+# don't require %{php_pear_dir}/data files we provide.
+# TODO treemenu needs patching (removing from this package)
+# pear/PhpDocumentor can optionally use package "pear/XML_Beautifier" (version >= 1.1)
+%define		_noautoreq	'pear(phpDocumentor/.*)' 'pear(%{php_pear_dir}/data/.*)' 'pear(XML/Beautifier/.*)' 'pear(HTML_TreeMenu-1.1.2/TreeMenu.php)'
 
 %description
 The phpDocumentor tool is a standalone auto-documentor similar to
@@ -117,31 +121,29 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
-%patch0 -p0
-%patch1 -p0
-
-cd %{_pearname}-%{version}
-
-# undos the sources
-find . -type f -print0 | xargs -0 sed -i -e 's,
$,,'
-
-grep -rl @DATA-DIR@ . | xargs -r sed -i -e 's, at DATA-DIR@,%{php_pear_dir},g'
+%pear_package_setup
 
-# Set up correct path
-sed -i -e 's#@PHP-BIN@#%{_bindir}/php#' pear-phpdoc
+# remove bundled Smarty cache, poldek goes crazy on them (provides/requires payload exceeded 64k)
+find -name templates_c | xargs -ri sh -c 'rm -rf {}; mkdir {}'
 
-# rename
-cd phpDocumentor
-for a in Converter.inc IntermediateParser.inc Setup.inc.php; do
-	mv pear-$a $a
-done
-
-# wasn't bundled before. so remove
-rm -f Smarty-2.5.0/{BUGS,COPYING.lib,ChangeLog,FAQ,INSTALL,NEWS,README,RELEASE_NOTES,TODO}
+# patches
+#%patch0 -p1
+#%patch1 -p1
+%patch2 -p1
+
+# remove bundled Smarty. use system one.
+mkdir plugins
+mv ./%{php_pear_dir}/PhpDocumentor/phpDocumentor/Smarty-*/libs/plugins/\
+{block.strip.php,function.{assign,var_dump}.php,modifier.{htmlentities,rawurlencode}.php} plugins
+rm -rf ./%{php_pear_dir}/PhpDocumentor/phpDocumentor/Smarty-*
+rm -rf ./%{php_pear_dir}/data/PhpDocumentor/phpDocumentor/Smarty-*
+
+# useless
+cd ./%{php_pear_dir}
+rm -rf tests/PhpDocumentor/Documentation/tests
 
 # and these. correct if it's wrong
-cd Converters/HTML
+cd data/PhpDocumentor/phpDocumentor/Converters/HTML
 rm -f \
 	Smarty/templates/default/templates/layout.css \
 	Smarty/templates/default/templates/style.css \
@@ -152,24 +154,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Create directory tree
-install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir}/%{_class}}
-
-cd %{_pearname}-%{version}
-cp -a docbuilder media phpDocumentor scripts user $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install pear-phpdoc $RPM_BUILD_ROOT%{_bindir}/phpdoc
-install phpdoc.php new_phpdoc.php phpDocumentor.ini $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir},%{_smartyplugindir}}
+cp -a ./%{_bindir}/phpdoc $RPM_BUILD_ROOT%{_bindir}
+%pear_package_install
+cp -a plugins/* $RPM_BUILD_ROOT%{_smartyplugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
+	cat %{_docdir}/%{name}-%{version}/optional-packages.txt
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*,poweredbyphpdoc.gif}
-%doc %{_pearname}-%{version}/{Documentation,tutorials}
+%doc install.log optional-packages.txt
+%doc docs/%{_pearname}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*}
+%doc docs/%{_pearname}/{Documentation,tutorials}
+%{php_pear_dir}/.registry/*.reg
 %attr(755,root,root) %{_bindir}/phpdoc
-%dir %{php_pear_dir}/%{_class}
-%{php_pear_dir}/%{_class}/*
+
+%{php_pear_dir}/%{_class}
+%{php_pear_dir}/data/%{_class}
+
+# extra Smarty plugins
+%{_smartyplugindir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -177,6 +187,56 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/09/29 19:58:12  glen
+- updated 1.3.0RC3 from DEVEL. this one at least works
+
+Revision 1.11.2.15  2005/09/29 19:54:43  glen
+- update TODO
+
+Revision 1.11.2.14  2005/09/19 17:36:33  glen
+- macros moved to rpm-build
+
+Revision 1.11.2.13  2005/09/18 12:40:26  glen
+- use optional-packages.txt; unify; registry file fixed
+
+Revision 1.11.2.12  2005/09/18 11:00:35  glen
+- use php-pear-build
+
+Revision 1.11.2.11  2005/09/18 10:09:20  glen
+- such package method requires php-zlib
+
+Revision 1.11.2.10  2005/09/18 09:54:09  glen
+- use system Smarty
+
+Revision 1.11.2.9  2005/09/18 09:23:20  glen
+- pear/XML_Beautifier is optional
+
+Revision 1.11.2.8  2005/09/18 09:04:04  glen
+- freshes pear package devs
+
+Revision 1.11.2.7  2005/08/25 10:17:16  arekm
+- fix br
+
+Revision 1.11.2.6  2005/08/25 10:04:42  glen
+- commit my last changes, dated 2005-06-19
+
+Revision 1.11.2.5  2005/06/19 17:04:13  glen
+- missing dir
+- NOTE: it doesn't work non-root now
+
+Revision 1.11.2.4  2005/06/19 16:40:02  glen
+- updated to 1.3.0RC3
+
+Revision 1.11.2.3  2005/06/19 16:22:32  glen
+- runtime pear registry stuff gone
+- doesn't work with php5
+
+Revision 1.11.2.2  2005/06/19 14:30:27  glen
+- memory problem resolved
+
+Revision 1.11.2.1  2005/06/19 14:26:24  glen
+- worked with packaging using pear
+
 Revision 1.11  2005/05/07 15:36:26  glen
 - simplified install (the filelist is same with previous version with minor fixes. so it should be ok)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list