rpms/php-pear-PhpDocumentor/F-8 php-pear-PhpDocumentor.spec, 1.4, 1.5

Konstantin Ryabitsev (icon) fedora-extras-commits at redhat.com
Fri Mar 21 19:12:29 UTC 2008


Author: icon

Update of /cvs/extras/rpms/php-pear-PhpDocumentor/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22305/F-8

Modified Files:
	php-pear-PhpDocumentor.spec 
Log Message:
Use system php-Smarty.



Index: php-pear-PhpDocumentor.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PhpDocumentor/F-8/php-pear-PhpDocumentor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-PhpDocumentor.spec	17 Feb 2008 21:06:59 -0000	1.4
+++ php-pear-PhpDocumentor.spec	21 Mar 2008 19:11:48 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          The complete documentation solution for PHP
 Name:             php-pear-PhpDocumentor
 Version:          1.4.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          LGPLv2+
 Group:            Development/Libraries
 URL:              http://www.phpdoc.org/
@@ -13,7 +13,7 @@
 
 BuildArch:        noarch
 BuildRequires:    php-pear >= 1:1.4.9
-Requires:         php-pear(PEAR)
+Requires:         php-pear(PEAR), php-Smarty >= 2.6.0
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(%{pear_name}) = %{version}
@@ -56,6 +56,9 @@
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
 
+# don't install our own php-Smarty
+sed -i -e '/Smarty-2/d' %{pear_name}.xml
+
 
 %build
 
@@ -78,6 +81,10 @@
 # Remove scripts out of bindir
 rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts 
 
+# Point to the system php-Smarty
+sed -i -e "s|phpDocumentor/Smarty-2.6.0/libs|Smarty|" \
+    $RPM_BUILD_ROOT%{pear_phpdir}/%{pear_name}/phpDocumentor/Converter.inc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,6 +121,9 @@
 
 
 %changelog
+* Fri Mar 21 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.1-2
+- Use system php-Smarty.
+
 * Sun Feb 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.1-1
 - Upstream 1.4.1.
 




More information about the fedora-extras-commits mailing list