SPECS (DEVEL): ZendOptimizer.spec - strict internal deps

[glen]

Author: glen                         Date: Fri Sep 30 10:28:12 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- strict internal deps

---- Files affected:
SPECS:
   ZendOptimizer.spec (1.19.2.6 -> 1.19.2.7) 

---- Diffs:

================================================================
Index: SPECS/ZendOptimizer.spec
diff -u SPECS/ZendOptimizer.spec:1.19.2.6 SPECS/ZendOptimizer.spec:1.19.2.7
--- SPECS/ZendOptimizer.spec:1.19.2.6	Fri Sep 30 12:19:25 2005
+++ SPECS/ZendOptimizer.spec	Fri Sep 30 12:28:06 2005
@@ -9,7 +9,7 @@
 Summary(pl):	Zend Optimizer - optymalizator kodu PHP
 Name:		ZendOptimizer
 Version:	2.5.10a
-Release:	0.11
+Release:	0.13
 License:	Zend License, distributable only if unmodified and for free (see LICENSE)
 Group:		Libraries
 Source0:	http://downloads.zend.com/optimizer/2.5.10/%{name}-%{version}-linux-glibc21-i386.tar.gz
@@ -26,7 +26,7 @@
 # circular dependency, so ones upgraded are forced to choose php and
 # ones that want to install specific for specific version need not to
 # install ZendOptimizer separately
-Requires:	ZendOptimizer(php)
+Requires:	%{name}(php) = %{version}-%{release}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,9 +39,9 @@
 %package -n php4-%{name}
 Summary:	Zend Optimizer for PHP 4.x.
 Group:		Libraries
-Requires:	ZendOptimizer = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	php4 >= 3:4.0.6
-Provides:	ZendOptimizer(php)
+Provides:	%{name}(php) = %{version}-%{release}
 
 %description -n php4-%{name}
 Zend Optimizer for PHP 4.x.
@@ -49,9 +49,9 @@
 %package -n php-%{name}
 Summary:	Zend Optimizer for PHP 5.x.
 Group:		Libraries
-Requires:	ZendOptimizer = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	php >= 4:5.0.0
-Provides:	ZendOptimizer(php)
+Provides:	%{name}(php) = %{version}-%{release}
 
 %description -n php-%{name}
 Zend Optimizer for PHP 5.x.
@@ -68,17 +68,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/Zend/lib/Optimizer{,_TS}-%{version},%{_bindir},/etc/php{,4},}
+install -d $RPM_BUILD_ROOT{%{_bindir},/etc/php4,/etc/php}
 
 echo "zend_optimizer.version=%{version}" > $RPM_BUILD_ROOT/etc/php4/pack.ini
 echo "zend_optimizer.version=%{version}" > $RPM_BUILD_ROOT/etc/php/pack.ini
 
 cd data
-install zendid $RPM_BUILD_ROOT%{_bindir}
-install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php
-install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php4
-install *.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib
-
 for a in *_comp; do
 	d=$(basename $a _comp | tr _ .)
 	install -D $a/ZendOptimizer.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Optimizer-%{version}/php-$d/ZendOptimizer.so
@@ -88,6 +83,10 @@
 	install -D $a/ZendOptimizer.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Optimizer_TS-%{version}/php-$d/ZendOptimizer.so
 done
 
+install zendid $RPM_BUILD_ROOT%{_bindir}
+install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php
+install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php4
+install *.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib
 ln -s %{_sysconfdir}/php $RPM_BUILD_ROOT%{_libdir}/Zend/etc
 ln -s %{_bindir} $RPM_BUILD_ROOT%{_libdir}/Zend/bin
 
@@ -171,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19.2.7  2005/09/30 10:28:06  glen
+- strict internal deps
+
 Revision 1.19.2.6  2005/09/30 10:19:25  glen
 - adapterized, unified use /etc/ and sysconfdir
 - fixed php4 dep
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ZendOptimizer.spec?r1=1.19.2.6&r2=1.19.2.7&f=u