packages: php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec - move docs an...

Tue Apr 5 05:39:21 CEST 2011

Author: glen                         Date: Tue Apr  5 03:39:21 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move docs and tutorials to -doc
- license is LGPL v2
- modernize spec

---- Files affected:
packages/php-pear-PhpDocumentor:
   php-pear-PhpDocumentor.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec
diff -u packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec:1.43 packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec:1.44

--- packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec:1.43	Tue Mar  1 07:28:53 2011
+++ packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec	Tue Apr  5 05:39:15 2011
@@ -2,22 +2,19 @@
 # TODO:
 # - solve requires issue (something like patch0, but a bit extended?)
 # - maybe PhpDocumentor.ini should go to /etc/php ?
-# - subpackage for -tutorial?
 # - subpackage for -cli?
 # - subpackage docBuilder for web interface in %{php_pear_dir}/data/%{_pearname}
 # - treemenu needs patching (removing from this package)
-%include	/usr/lib/rpm/macros.php
-%define		_class		PhpDocumentor
 %define		_status		stable
-%define		_pearname	%{_class}
-
+%define		_pearname	PhpDocumentor
+%define		php_min_version 5.0.0
+%include	/usr/lib/rpm/macros.php
 Summary:	%{_pearname} - provides automatic documenting of PHP API directly from source
 Summary(pl.UTF-8):	%{_pearname} - automatyczne tworzenie dokumentacji API PHP prosto ze źródeł
 Name:		php-pear-%{_pearname}
 Version:	1.4.3
-Release:	3
-Epoch:		0
-License:	PHP 3.00
+Release:	4
+License:	LGPL v2.1
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	180ea5bf2ab4f729d0cd09d99f7b2520
@@ -25,14 +22,14 @@
 URL:		http://pear.php.net/package/PhpDocumentor/
 BuildRequires:	php-pear-PEAR >= 1:1.4.6
 BuildRequires:	rpm-php-pearprov >= 4.4.2-10.2
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.593
 Requires:	Smarty >= 2.6.10-4
-Requires:	php(pcre)
-Requires:	php(tokenizer)
 Requires:	php-cli
-Requires:	php-common >= 3:4.3.0
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-pcre
 Requires:	php-pear >= 4:1.0-2.8
 Requires:	php-pear-Archive_Tar >= 1.1
+Requires:	php-tokenizer
 Suggests:	php-pear-XML_Beautifier
 Obsoletes:	php-pear-PhpDocumentor-tests
 BuildArch:	noarch
@@ -42,7 +39,7 @@
 
 # exclude optional dependencies
 # don't require %{php_pear_dir}/data files we provide.
-%define		_noautoreq	'pear(phpDocumentor/.*)' 'pear(%{php_pear_dir}/data/.*)' 'pear(XML/Beautifier/.*)' 'pear(HTML_TreeMenu-1.1.2/TreeMenu.php)'
+%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
@@ -128,22 +125,41 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
+%package doc
+Summary:	Documentation and tutorial manual PhpDocumentor
+Summary(pl.UTF-8):	Dokumentacja online do %{name}
+Group:		Documentation
+
+%description doc
+Documentation and tutorial manual PhpDocumentor
+
 %prep
 %pear_package_setup
 %patch0 -p1
 
-rm -f docs/%{_pearname}/PHPLICENSE # PHP License
-
 # 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-*
+%{__rm} -r ./%{php_pear_dir}/PhpDocumentor/phpDocumentor/Smarty-*
+%{__rm} -r ./%{php_pear_dir}/data/PhpDocumentor/phpDocumentor/Smarty-*
+
+# maintainer's scripts
+%{__rm} -r ./%{php_pear_dir}/PhpDocumentor/scripts
 
-# packaging corrections. we want sample scripts in doc
-install -d docs/%{_pearname}
-mv ./%{php_pear_dir}/%{_class}/scripts docs/%{_pearname}
+%{__rm} docs/%{_pearname}/LICENSE # LGPL v2.1
+
+# old release docs
+%{__rm} -r docs/%{_pearname}/Documentation/Release-old
+
+# drop tests
+%{__rm} -r docs/%{_pearname}/Documentation/tests
+
+# doc subpackage
+install -d doc
+mv docs/%{_pearname}/Documentation/* doc
+rmdir docs/%{_pearname}/Documentation
+mv docs/%{_pearname}/tutorials doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -156,10 +172,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
-	cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-fi
+%post -p <lua>
+%pear_package_print_optionalpackages
 
 %files
 %defattr(644,root,root,755)
@@ -167,18 +181,27 @@
 %doc docs/%{_pearname}/*
 %{php_pear_dir}/.registry/*.reg
 %attr(755,root,root) %{_bindir}/phpdoc
-%{php_pear_dir}/%{_class}
-%{php_pear_dir}/data/%{_class}
+%{php_pear_dir}/PhpDocumentor
+%{php_pear_dir}/data/PhpDocumentor
 
 # extra Smarty plugins
 %{_smartyplugindir}/*
 
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2011/04/05 03:39:15  glen
+- move docs and tutorials to -doc
+- license is LGPL v2
+- modernize spec
+
 Revision 1.43  2011/03/01 06:28:53  glen
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PhpDocumentor/php-pear-PhpDocumentor.spec?r1=1.43&r2=1.44&f=u

