- created -program package which will be providing /usr/bin/php symlink; rel 17

Changed files:
    php4.spec -> 1.497

diff --git a/php4.spec b/php4.spec
index 99490da234994328c9a29e7501c7bd7666c2b03b..20109802667f8c5570eb1d4cb767d5b815ec3ae1 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -76,7 +76,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php4
 Version:       4.4.0
-Release:       16%{?with_hardening:hardened}
+Release:       17%{?with_hardening:hardened}
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -337,8 +337,6 @@ Summary(pl):        php4 jako program FastCGI
 Group:         Development/Languages/PHP
 PreReq:                %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php-fcgi = %{epoch}:%{version}-%{release}
-Provides:      php-program = %{epoch}:%{version}-%{release}
-Provides:      %{name}-program = %{epoch}:%{version}-%{release}
 
 %description fcgi
 php4 as FastCGI program.
@@ -352,8 +350,6 @@ Summary(pl):        php4 jako program CGI
 Group:         Development/Languages/PHP
 PreReq:                %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php-cgi = %{epoch}:%{version}-%{release}
-Provides:      php-program = %{epoch}:%{version}-%{release}
-Provides:      %{name}-program = %{epoch}:%{version}-%{release}
 
 %description cgi
 php4 as CGI program.
@@ -367,8 +363,6 @@ Summary(pl):        php4 jako interpreter dzia
 Group:         Development/Languages/PHP
 PreReq:                %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php-cli = %{epoch}:%{version}-%{release}
-Provides:      php-program = %{epoch}:%{version}-%{release}
-Provides:      %{name}-program = %{epoch}:%{version}-%{release}
 
 %description cli
 php4 as CLI interpreter.
@@ -376,6 +370,16 @@ php4 as CLI interpreter.
 %description cli -l pl
 php4 jako interpreter dzia³aj±cy z linii poleceñ.
 
+%package program
+Summary:       /usr/bin/php symlink
+Group:         Development/Languages/PHP
+Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
+Provides:      php(program)
+Obsoletes:     php(program)
+
+%description program
+Package providing /usr/bin/php symlink to PHP CLI.
+
 %package common
 Summary:       Common files needed by all PHP SAPIs
 Summary(pl):   Wspólne pliki dla modu³u apache'a i programu CGI
@@ -1918,6 +1922,7 @@ libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/p
 
 install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php4.1
 ln -sf php4.cli $RPM_BUILD_ROOT%{_bindir}/php4
+ln -sf php4.cli $RPM_BUILD_ROOT%{_bindir}/php
 
 %{?with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{extensionsdir}}
 
@@ -2716,13 +2721,14 @@ fi
 %defattr(644,root,root,755)
 %doc sapi/cli/{CREDITS,README}
 %attr(755,root,root) %{_bindir}/php4.cli
-# TODO
-# - what about _bindir/php symlink?
-# - do it same way link /usr/src/linux is done, ie each package updates symlink
 %attr(755,root,root) %{_bindir}/php4
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini
 %{_mandir}/man1/php4.1*
 
+%files program
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/php
+
 %files common
 %defattr(644,root,root,755)
 %doc php.ini-*