Author: glen Date: Sun Jun 19 16:22:37 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- runtime pear registry stuff gone
- doesn't work with php5
---- Files affected:
SPECS:
php-pear-PhpDocumentor.spec (1.11.2.2 -> 1.11.2.3)
---- Diffs:
================================================================
Index: SPECS/php-pear-PhpDocumentor.spec
diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.2
SPECS/php-pear-PhpDocumentor.spec:1.11.2.3
--- SPECS/php-pear-PhpDocumentor.spec:1.11.2.2 Sun Jun 19 16:30:27 2005
+++ SPECS/php-pear-PhpDocumentor.spec Sun Jun 19 18:22:32 2005
@@ -13,7 +13,7 @@
Summary(pl): %{_pearname} - automatyczne tworzenie dokumentacji API PHP
prosto ze źródeł
Name: php-pear-%{_pearname}
Version: 1.2.3
-Release: 0.16
+Release: 0.21
License: PHP 3.00
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -26,7 +26,7 @@
BuildRequires: sed >= 4.0
Requires(post): php-pear-PEAR
Requires(preun): php-pear-PEAR
-Requires: php-pear
+Requires: php-pear >= 4:1.0-2.8
Requires: php-cli
Requires: php-pcre
BuildArch: noarch
@@ -35,9 +35,6 @@
# 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)'
-%define __pear %{_bindir}/pear
-%define _sysconfdir /etc/pear
-
%description
The phpDocumentor tool is a standalone auto-documentor similar to
JavaDoc written in PHP. It differs from PHPDoc in that it is MUCH
@@ -125,10 +122,10 @@
%prep
%setup -q -c
-# use pear to install it to ./build
+# use pear to install it to ../build
mv package.xml %{_pearname}-%{version}
cd %{_pearname}-%{version}
-%{__pear} \
+pear \
-d doc_dir=%{_docdir} \
-d data_dir=%{php_pear_dir}/data \
install \
@@ -137,15 +134,22 @@
--nodeps \
package.xml \
-#exit 0
-#cd %{_pearname}-%{version}
+cd ../build
# undos the sources
find . -type f -print0 | xargs -0 sed -i -e 's,
$,,'
+# 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
+
# patch the sources
# include only these to this package and depend on smarty?
#Only in Smarty-2.5.0/libs/plugins: block.strip.php
@@ -154,16 +158,11 @@
#Only in Smarty-2.5.0/libs/plugins: modifier.htmlentities.php
#Only in Smarty-2.5.0/libs/plugins: modifier.rawurlencode.php
-#%patch0 -p1
-#%patch1 -p1
-
-exit 0
-
# wasn't bundled before. so remove
-rm -f
Smarty-2.5.0/{BUGS,COPYING.lib,ChangeLog,FAQ,INSTALL,NEWS,README,RELEASE_NOTES,TODO}
+rm -f
PhpDocumentor/phpDocumentor/Smarty-2.5.0/{BUGS,COPYING.lib,ChangeLog,FAQ,INSTALL,NEWS,README,RELEASE_NOTES,TODO}
# 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 \
@@ -174,52 +173,43 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{php_pear_dir}}
+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}
-#%{__pear} \
-# -d doc_dir=%{_docdir}/%{name}-%{version} \
-# install \
-# --installroot=$RPM_BUILD_ROOT \
-# --offline \
-# --nodeps \
-# --ignore-errors \
-# package.xml
-install package.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_pearname}.xml
+pear -q install \
+ --register-only --force --offline \
+ --installroot=$RPM_BUILD_ROOT package.xml
-# useless
-rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/tests/PhpDocumentor/Documentation/tests
+# pear registry files
+rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/.{channels,dep*,filemap,lock}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-%{__pear} -q upgrade --register-only --force --offline
%{_sysconfdir}/%{_pearname}.xml
-
-%preun
-if [ "$1" = 0 ]; then
- %{__pear} -q uninstall --register-only --offline %{_pearname}
-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 build/usr/bin/scripts
-%{_sysconfdir}/*.xml
%attr(755,root,root) %{_bindir}/phpdoc
%dir %{php_pear_dir}/%{_class}
%{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 <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.2&r2=1.11.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
