SPECS (DEVEL): php-pear-PhpDocumentor.spec - freshes pear package ...

[glen]

Author: glen                         Date: Sun Sep 18 09:04:10 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- freshes pear package devs

---- Files affected:
SPECS:
   php-pear-PhpDocumentor.spec (1.11.2.7 -> 1.11.2.8) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PhpDocumentor.spec
diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.7 SPECS/php-pear-PhpDocumentor.spec:1.11.2.8
--- SPECS/php-pear-PhpDocumentor.spec:1.11.2.7	Thu Aug 25 12:17:16 2005
+++ SPECS/php-pear-PhpDocumentor.spec	Sun Sep 18 11:04:04 2005
@@ -22,7 +22,7 @@
 Patch0:		%{name}-includes_fix.patch
 Patch1:		%{name}-html_treemenu_includes_fix.patch
 URL:		http://pear.php.net/package/PhpDocumentor/
-BuildRequires:	php-pear-PEAR >= 1:1.4.0-0.a11.5
+BuildRequires:	php-pear-PEAR >= 1:1.4.0-0.b1.3
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	sed >= 4.0
 Requires(post):		php-pear-PEAR
@@ -33,8 +33,9 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# dunno, i need this package NOW
-#%define		_noautoreq	'pear(phpDocumentor/.*)' 'pear(/usr/share/pear/data/PhpDocumentor/docbuilder/includes/utilities.php)' 'pear(HTML_TreeMenu-1.1.2/TreeMenu.php)'
+# don't require %{php_pear_dir}/data files we provide.
+# TODO treemenu needs patching (removing from this package)
+%define		_noautoreq	'pear(phpDocumentor/.*)' 'pear(%{php_pear_dir}/data)' 'pear(HTML_TreeMenu-1.1.2/TreeMenu.php)'
 
 %description
 The phpDocumentor tool is a standalone auto-documentor similar to
@@ -121,35 +122,15 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
+%pear_package_setup
 
-# use pear to install it to ../build
-mv package.xml %{_pearname}-%{version}%{_rc}
-cd %{_pearname}-%{version}%{_rc}
-pear \
-	-d doc_dir=%{_docdir} \
-	-d data_dir=%{php_pear_dir}/data \
-	install \
-	--installroot=../build \
-	--offline \
-	--nodeps \
-	package.xml \
-
-cd ../build
-
-# undos the sources
-find . -type f -print0 | xargs -0 sed -i -e 's,
$,,'
-
-# jesus, remove the Smarty cache, poldek goes crazy on them
+# jesus, remove the Smarty cache, poldek goes crazy on them (provides/requires payload exceeded 64k)
 find -name templates_c | xargs -ri sh -c 'rm -rf {}; mkdir {}'
 
 # patches
 #%patch0 -p1
 #%patch1 -p1
 
-# remove installroot (why it's there?)
-grep -rl '\.\./build' ../build | xargs -r sed -i -e 's,\.\./build,,g'
-
 # useless
 cd .%{php_pear_dir}
 rm -rf tests/PhpDocumentor/Documentation/tests
@@ -178,45 +159,32 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir}}
-cp -a build/%{_bindir}/phpdoc $RPM_BUILD_ROOT%{_bindir}
-cp -a build/%{php_pear_dir}/* $RPM_BUILD_ROOT%{php_pear_dir}
-
-cd %{_pearname}-%{version}%{_rc}
-pear -q install \
-	--register-only --force --offline \
-	--installroot=$RPM_BUILD_ROOT package.xml
-
-# pear registry files
-rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/.{channels,dep*,filemap,lock}
+cp -a ./%{_bindir}/phpdoc $RPM_BUILD_ROOT%{_bindir}
+cp -a ./%{php_pear_dir}/* $RPM_BUILD_ROOT%{php_pear_dir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -x /usr/bin/pear ]; then
-	umask 002
-	# this builds the pear registry depdb
-	/usr/bin/pear list > /dev/null
-fi
-
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}%{_rc}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*,poweredbyphpdoc.gif}
-%doc %{_pearname}-%{version}%{_rc}/{Documentation,tutorials}
-%doc build/usr/bin/scripts
+%doc ./%{_docdir}/%{_pearname}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*}
+%doc ./%{_docdir}/%{_pearname}/{Documentation,tutorials}
+%doc ./%{_bindir}/scripts
+#%{php_pear_dir}/.registry/*.reg
 %attr(755,root,root) %{_bindir}/phpdoc
 
 %{php_pear_dir}/%{_class}
 %{php_pear_dir}/data/%{_class}
 
-%{php_pear_dir}/.registry/*.reg
-
 %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.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
 
================================================================

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