SPECS: php4.spec - created -program package which will be providin...

glen glen at pld-linux.org
Sat Oct 29 15:42:30 CEST 2005


Author: glen                         Date: Sat Oct 29 13:42:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- created -program package which will be providing /usr/bin/php symlink; rel 17

---- Files affected:
SPECS:
   php4.spec (1.496 -> 1.497) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.496 SPECS/php4.spec:1.497
--- SPECS/php4.spec:1.496	Sat Oct 29 15:37:36 2005
+++ SPECS/php4.spec	Sat Oct 29 15:42:25 2005
@@ -77,7 +77,7 @@
 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
@@ -338,8 +338,6 @@
 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.
@@ -353,8 +351,6 @@
 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.
@@ -368,8 +364,6 @@
 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.
@@ -377,6 +371,16 @@
 %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
@@ -1919,6 +1923,7 @@
 
 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}}
 
@@ -2717,13 +2722,14 @@
 %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-*
@@ -3231,6 +3237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.497  2005/10/29 13:42:25  glen
+- created -program package which will be providing /usr/bin/php symlink; rel 17
+
 Revision 1.496  2005/10/29 13:37:36  arekm
 - correct zend_extension_api error message.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.496&r2=1.497&f=u




More information about the pld-cvs-commit mailing list