rpms/php-pear-PhpDocumentor/EL-6 php-pear-PhpDocumentor.spec, 1.9, 1.10

[Christof Damian]

Author: cdamian

Update of /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24639

Modified Files:
	php-pear-PhpDocumentor.spec 
Log Message:
- use global instead of define
- use pear download url
- add php-pear-XML-Beautifier dependency
- use pear_testdir and pear_datadir macros
- make example script in docdir non executeable




Index: php-pear-PhpDocumentor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-6/php-pear-PhpDocumentor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- php-pear-PhpDocumentor.spec	18 Sep 2009 17:32:30 -0000	1.9
+++ php-pear-PhpDocumentor.spec	4 Jul 2010 10:15:00 -0000	1.10
@@ -1,19 +1,21 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name PhpDocumentor
+%global pear_name PhpDocumentor
 
 Summary:          The complete documentation solution for PHP
 Name:             php-pear-PhpDocumentor
 Version:          1.4.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          LGPLv2+
 Group:            Development/Libraries
 URL:              http://www.phpdoc.org/
-Source0:          http://download.sourceforge.net/phpdocu/%{pear_name}-%{version}.tgz
+Source0:          http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
 BuildRequires:    php-pear >= 1:1.4.9
-Requires:         php-pear(PEAR), php-Smarty >= 2.6.0
+Requires:         php-pear(PEAR)
+Requires:         php-Smarty >= 2.6.0
+Requires:         php-pear-XML-Beautifier >= 1.1
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(%{pear_name}) = %{version}
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# make example script non executable
+chmod -x scripts/makedoc.sh
+
 # Remove scripts out of bindir
 rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts 
 
@@ -105,8 +110,8 @@ fi
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/LICENSE
 %{pear_phpdir}/%{pear_name}
-%{pear_phpdir}/data/%{pear_name}
-%{pear_phpdir}/test/%{pear_name}
+%{pear_datadir}/%{pear_name}
+%{pear_testdir}/%{pear_name}
 %{pear_xmldir}/%{pear_name}.xml
 
 %files -n phpdoc
@@ -121,6 +126,13 @@ fi
 
 
 %changelog
+* Wed Feb 3 2010 Christof Damian <christof at damian.net> 1.4.3-2
+- use global instead of define
+- use pear download url
+- add php-pear-XML-Beautifier dependency
+- use pear_testdir and pear_datadir macros
+- make example script in docdir non executeable
+
 * Fri Sep 18 2009 Christof Damian <christof at damian.net> - 1.4.3-1
 - Upstream 1.4.3