Author: glen Date: Sun Jun 18 10:44:12 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- /usr/share/php already in php-dirs pkg, rel 3
---- Files affected:
SPECS:
php.spec (1.576 -> 1.577)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.576 SPECS/php.spec:1.577
--- SPECS/php.spec:1.576 Fri May 26 11:05:52 2006
+++ SPECS/php.spec Sun Jun 18 12:44:06 2006
@@ -67,7 +67,7 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define _rel 2
+%define _rel 3
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Język skryptowy PHP
@@ -194,7 +194,6 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/php
-%define _phpsharedir %{_datadir}/php
%define extensionsdir %{_libdir}/php
# must be in sync with source. extra check ensuring that it is so is done in
%%build
@@ -1783,7 +1782,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}}
\
+install -d
$RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
$RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/httpd.conf} \
@@ -2576,7 +2575,6 @@
%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/php.ini
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{extensionsdir}
-%dir %{_phpsharedir}
# session_mm doesn't work with shared session
#%files session
@@ -2999,6 +2997,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.577 2006/06/18 10:44:06 glen
+- /usr/share/php already in php-dirs pkg, rel 3
+
Revision 1.576 2006/05/26 09:05:52 hawk
- added fix for CLI SEGVs with tidy or sybase_ct enabled
- renumbered patches, cleanup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.576&r2=1.577&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
