- need Zend in path component, install to %{php_pear_dir}/Zend

Changed files:
    ZendFramework.spec -> 1.13

diff --git a/ZendFramework.spec b/ZendFramework.spec
index f322bed4d1e26023a775c23603839b7c2da4c525..be1d80af45a8e005a001b61f41be23680df91a1c 100644 (file)
--- a/ZendFramework.spec
+++ b/ZendFramework.spec
@@ -4,7 +4,7 @@ Summary:        Zend Framework
 Summary(pl.UTF-8):     Szkielet Zend
 Name:          ZendFramework
 Version:       1.5.2
-Release:       1.2
+Release:       1.5
 License:       Zend Framework License, 1.0, (distributable, see LICENSE)
 Group:         Development/Languages/PHP
 Source0:       http://framework.zend.com/releases/%{name}-%{version}/ZendFramework-%{version}.tar.gz
@@ -21,8 +21,6 @@ Obsoletes:    ZendFramework-doc
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _appdir %{_datadir}/%{name}
-
 %description
 Zend Framework is a high quality and open source framework for
 developing Web Applications and Web Services.
@@ -55,11 +53,11 @@ Programy demonstracyjne dla szkieletu Zend Framework.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_appdir}}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{php_pear_dir}}
 cp -a demos/Zend/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# library should be in include_path if used
-cp -a library/Zend/* $RPM_BUILD_ROOT%{_appdir}
+# library should be in include_path if used, so we use already defined %{php_pear_dir}
+cp -a library/* $RPM_BUILD_ROOT%{php_pear_dir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt README.txt
-%{_appdir}
+%{php_pear_dir}
 
 %files demos
 %defattr(644,root,root,755)