- 5.0.0 final (NFY)

Changed files:
    ZendStudioServer.spec -> 1.5

diff --git a/ZendStudioServer.spec b/ZendStudioServer.spec
index 451263ae1247e0bdb68ed7a1003b1a8e05344300..b04b655b991a6aa3ad554f0cb0dfe94a3a5c13a4 100644 (file)
--- a/ZendStudioServer.spec
+++ b/ZendStudioServer.spec
@@ -2,16 +2,15 @@ Summary:      ZendStudioServer - server management tools for PHP based Web servers
 Summary(pl):   ZendStudioServer - narzêdzia zarz±dzaj±ce dla serwerów WWW opartych na PHP
 Name:          ZendStudioServer
 Version:       5.0.0
 Summary(pl):   ZendStudioServer - narzêdzia zarz±dzaj±ce dla serwerów WWW opartych na PHP
 Name:          ZendStudioServer
 Version:       5.0.0

-%define        _beta Beta
-Release:       0.%{_beta}.1
+Release:       0.1

 Epoch:         0
 License:       Zend Studio License
 Group:         Applications
 Epoch:         0
 License:       Zend Studio License
 Group:         Applications

-Source0:       http://downloads.zend.com/studio/5.0.0beta/%{name}-%{version}%{_beta}-linux-glibc21-i386.tar.gz
-# NoSource0-md5:       1429e3a6263ded21e0827344a9bbd9b6
+Source0:       http://downloads.zend.com/studio/5.0.0/%{name}-%{version}-linux-glibc21-i386.tar.gz
+# NoSource0-md5:       c55d9bbde4ec1eceba1b6a06e6ead9c3

 NoSource:      0
 NoSource:      0

-Source1:       http://downloads.zend.com/studio/5.0.0beta/%{name}-%{version}%{_beta}-linux-glibc23-x86_64.tar.gz
-# NoSource1-md5:       885e25876d68d0b51f03c3dbd8717800
+Source1:       http://downloads.zend.com/studio/5.0.0/%{name}-%{version}-linux-glibc23-x86_64.tar.gz
+# NoSource1-md5:       dbb459de43cf1492404b140b9f33e0a4

 NoSource:      1
 BuildRequires: tar >= 1:1.15.1
 Requires:      ZendOptimizer
 NoSource:      1
 BuildRequires: tar >= 1:1.15.1
 Requires:      ZendOptimizer


@@ -19,6 +18,8 @@ ExclusiveArch:        %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _datadir        %{_prefix}/share/Zend
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _datadir        %{_prefix}/share/Zend

+%define                no_install_post_strip           1
+%define                no_install_post_chrpath         1

 
 %description
 Includes server management tools that manage PHP based Web servers.
 
 %description
 Includes server management tools that manage PHP based Web servers.


@@ -33,7 +34,7 @@ integracj
 diagnostyk± oraz zarz±dzanie bezpieczeñstwem.
 
 %prep
 diagnostyk± oraz zarz±dzanie bezpieczeñstwem.
 
 %prep

-%setup -q -c -T
+%setup -qcT

 %ifarch %{x8664}
 tar --strip-components=1 -xzf %{SOURCE1}
 %else
 %ifarch %{x8664}
 tar --strip-components=1 -xzf %{SOURCE1}
 %else


@@ -48,24 +49,21 @@ cd data
 install dummy.php $RPM_BUILD_ROOT%{_datadir}/htdocs
 cp -a gui/* $RPM_BUILD_ROOT%{_datadir}/htdocs
 install runas $RPM_BUILD_ROOT%{_bindir}
 install dummy.php $RPM_BUILD_ROOT%{_datadir}/htdocs
 cp -a gui/* $RPM_BUILD_ROOT%{_datadir}/htdocs
 install runas $RPM_BUILD_ROOT%{_bindir}

-#install dbgclient $RPM_BUILD_ROOT%{_bindir}

 install ini_modifier  $RPM_BUILD_ROOT%{_sbindir}
 
 install ini_modifier  $RPM_BUILD_ROOT%{_sbindir}
 

-install change_zend_gui_password.php $RPM_BUILD_ROOT%{_libdir}/Zend/lib/tools
+install change_gui_password.php $RPM_BUILD_ROOT%{_libdir}/Zend/lib/tools

 cp -a phplib $RPM_BUILD_ROOT%{_libdir}/Zend/lib/tools
 
 cp -a phplib $RPM_BUILD_ROOT%{_libdir}/Zend/lib/tools
 

-#install ZendExtensionManager{,_TS}.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib
-

 for a in *_comp; do
 for a in *_comp; do

-       d=$(basename $a _comp|tr _ .)
+       d=$(basename $a _comp | tr _ .)

        install -D $a/ZendDebugger.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Debugger-%{version}/php-$d/ZendDebugger.so
 done
 for a in *_comp/TS; do
        install -D $a/ZendDebugger.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Debugger-%{version}/php-$d/ZendDebugger.so
 done
 for a in *_comp/TS; do

-       d=$(basename $(dirname $a) _comp|tr _ .)
+       d=$(basename $(dirname $a) _comp | tr _ .)

        install -D $a/ZendDebugger.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Debugger_TS-%{version}/php-$d/ZendDebugger.so
 done
 
        install -D $a/ZendDebugger.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Debugger_TS-%{version}/php-$d/ZendDebugger.so
 done
 

-cat > php.ini <<EOF
+cat > zend.ini <<EOF

 [Zend]
 studio.install_dir=%{_datadir}
 zend_debugger.expose_remotely=allowed_hosts
 [Zend]
 studio.install_dir=%{_datadir}
 zend_debugger.expose_remotely=allowed_hosts


@@ -76,51 +74,22 @@ zend_debugger.allow_hosts=127.0.0.1/32,192.168.2.0/24
 zend_debugger.allow_tunnel=127.0.0.1/32
 zend_debugger.deny_hosts=
 zend_root_dir=%{_datadir}
 zend_debugger.allow_tunnel=127.0.0.1/32
 zend_debugger.deny_hosts=
 zend_root_dir=%{_datadir}

-#zend_extension_manager.optimizer=%{_libdir}/Zend/lib/Optimizer-2.5.8
-zend_extension_manager.debug_server=%{_libdir}/Zend/lib/Debugger-4.0.0
-#zend_extension_manager.optimizer_ts=%{_libdir}/Zend/lib/Optimizer_TS-2.5.8
-zend_extension_manager.debug_server_ts=%{_libdir}/Zend/lib/Debugger_TS-4.0.0
-#zend_extension=%{_libdir}/Zend/lib/ZendExtensionManager.so
-#zend_extension_ts=%{_libdir}/Zend/lib/ZendExtensionManager_TS.so

 EOF
 
 EOF
 

-#install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/zendstudioserver.ini
-sed -e 's,^#,;,' php.ini > $RPM_BUILD_ROOT%{_libdir}/Zend/php.ini
+cat <<'EOF' > pack.ini
+; ZendStudioServer package settings. Overwritten with each upgrade.
+; if you need to add options, edit %{name}.ini instead
+[Zend]
+zend_extension_manager.debug_server=%{_libdir}/Zend/lib/Debugger-%{version}
+zend_extension_manager.debug_server_ts=%{_libdir}/Zend/lib/Debugger_TS-%{version}
+EOF
+
+install zend.ini $RPM_BUILD_ROOT%{_libdir}/Zend/%{name}.ini
+install pack.ini $RPM_BUILD_ROOT%{_libdir}/Zend/%{name}_pack.ini

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-#%post
-#umask 022
-#for php in /etc/php{,4}/php.ini; do
-#      if [ -f $php ]; then
-#              echo "activating module 'ZendDebugger.so' in $php" 1>&2
-#              cp $php{,.zend-backup}
-#              grep -v zend_optimizer.optimization_level $php | \
-#              grep -v zend_extension > $php.tmp
-#              echo '[Zend]' >> $php.tmp
-#              echo "zend_optimizer.optimization_level=$optlevel" >> $php.tmp
-#              echo "zend_extension_manager.optimizer=%{_libdir}/Zend/lib/Optimizer-%{version}" >> $php.tmp
-#              echo "zend_extension_manager.optimizer_ts=%{_libdir}/Zend/lib/Optimizer_TS-%{version}" >> $php.tmp
-#              echo "zend_extension=%{_libdir}/Zend/lib/ZendExtensionManager.so" >> $php.tmp
-#              echo "zend_extension_ts=%{_libdir}/Zend/lib/ZendExtensionManager_TS.so" >> $php.tmp
-#              mv $php{.tmp,}
-#      fi
-#done
-
-#%postun
-#if [ "$1" = "0" ]; then
-#      umask 022
-#      for php in /etc/php{,4}/php.ini; do
-#              if [ -f $php ]; then
-#                      echo "deactivating module 'ZendDebugger.so' in $php" 1>&2
-#                      grep -v '\[Zend\]' $php |\
-#                      grep -v zend_extension |grep -v zend_optimizer > $php.tmp
-#                      mv $php.tmp $php
-#              fi
-#      done
-#fi
-

 %files
 %defattr(644,root,root,755)
 %doc README LICENSE LICENSE-PHP
 %files
 %defattr(644,root,root,755)
 %doc README LICENSE LICENSE-PHP


@@ -128,15 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/*
 %{_datadir}
 
 %attr(755,root,root) %{_sbindir}/*
 %{_datadir}
 

-#%dir %{_libdir}/Zend
-#%dir %{_libdir}/Zend/lib

 %dir %{_libdir}/Zend/lib/Debugger-%{version}
 %dir %{_libdir}/Zend/lib/Debugger-%{version}/php-*
 %dir %{_libdir}/Zend/lib/Debugger_TS-%{version}
 %dir %{_libdir}/Zend/lib/Debugger_TS-%{version}/php-*
 %attr(755,root,root) %{_libdir}/Zend/lib/Debugger-%{version}/php-*/ZendDebugger.so
 %attr(755,root,root) %{_libdir}/Zend/lib/Debugger_TS-%{version}/php-*/ZendDebugger.so
 %dir %{_libdir}/Zend/lib/Debugger-%{version}
 %dir %{_libdir}/Zend/lib/Debugger-%{version}/php-*
 %dir %{_libdir}/Zend/lib/Debugger_TS-%{version}
 %dir %{_libdir}/Zend/lib/Debugger_TS-%{version}/php-*
 %attr(755,root,root) %{_libdir}/Zend/lib/Debugger-%{version}/php-*/ZendDebugger.so
 %attr(755,root,root) %{_libdir}/Zend/lib/Debugger_TS-%{version}/php-*/ZendDebugger.so

-

 %{_libdir}/Zend/lib/tools
 %{_libdir}/Zend/lib/tools

-
-%{_libdir}/Zend/php.ini
+%{_libdir}/Zend/*.ini