SPECS (DEVEL): php.spec - php subdir in tests - fileinfo is now shared modu...

Fri Apr 17 12:44:02 CEST 2009

Author: glen                         Date: Fri Apr 17 10:44:02 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- php subdir in tests
- fileinfo is now shared module
- sqlite3 ext install fails with error cannot find -lsybtcl

---- Files affected:
SPECS:
   php.spec (1.688.2.29 -> 1.688.2.30) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.29 SPECS/php.spec:1.688.2.30

--- SPECS/php.spec:1.688.2.29	Thu Apr 16 01:50:14 2009
+++ SPECS/php.spec	Fri Apr 17 12:43:56 2009
@@ -17,6 +17,7 @@
 # - WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is
 #   built shared, also PHAR_HAVE_OPENSSL is false if openssl is built shared.
 #   make it runtime dep and add Suggests (or php warning messages)
+# - fix merging sapi configs with php.ini (lost in r1.688.2.28)
 # - some mods should be shared:
 #$ php -m
 # [PHP Modules]
@@ -133,9 +134,9 @@
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
 %endif
-Requires:	fcgi-devel
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
+Requires:	fcgi-devel
 %if %{with mssql} || %{with sybase_ct}
 BuildRequires:	freetds-devel >= 0.82
 %endif
@@ -335,7 +336,7 @@
 Pakiet dostarczający dowiązanie symboliczne /usr/bin/php do PHP CLI.
 
 %package common
-Summary:	Common files needed by both apache module and CGI
+Summary:	Common files needed by both Apache modules and CGI/CLI SAPI-s.
 Summary(pl.UTF-8):	Wspólne pliki dla modułu apache'a i programu CGI
 Summary(ru.UTF-8):	Разделяемые библиотеки для php
 Summary(uk.UTF-8):	Бібліотеки спільного використання для php
@@ -344,7 +345,6 @@
 Requires:	glibc >= 6:2.3.5
 Requires:	php-dirs
 Provides:	php(date)
-Provides:	php(fileinfo)
 Provides:	php(hash)
 Provides:	php(libxml)
 Provides:	php(modules_api) = %{php_api_version}
@@ -361,13 +361,12 @@
 Obsoletes:	php-mhash
 Obsoletes:	php-pcre < 4:5.2.0
 Obsoletes:	php-pecl-domxml
-Obsoletes:	php-pecl-fileinfo
 Obsoletes:	php-session < 3:4.2.1-2
 Conflicts:	php4-common < 3:4.4.4-8
 Conflicts:	rpm < 4.4.2-0.2
 
 %description common
-Common files needed by both apache module and CGI.
+Common files needed by both Apache modules and CGI/CLI SAPI-s.
 
 %description common -l pl.UTF-8
 Wspólne pliki dla modułu apacha i programu CGI.
@@ -867,9 +866,9 @@
 Summary(pl.UTF-8):	Moduł bazy danych Oracle 8+ dla PHP
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.oci8.php
-AutoReq:	false
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(oci8)
+AutoReq:	false
 
 %description oci8
 This is a dynamic shared object (DSO) for PHP that will add Oracle 7,
@@ -1907,10 +1906,10 @@
 install -d $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
 cp -a ext/mbstring/libmbfl/mbfl/*.h $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
 
-#tests
-install -d $RPM_BUILD_ROOT/usr/share/php/tests
-cp run-tests.php $RPM_BUILD_ROOT/usr/share/php/tests/run-tests.php
-cp -r  tests/* $RPM_BUILD_ROOT/usr/share/php/tests
+# tests
+install -d $RPM_BUILD_ROOT%{php_data_dir}/tests/php
+install run-tests.php $RPM_BUILD_ROOT%{php_data_dir}/tests/php/run-tests.php
+cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -2219,7 +2218,7 @@
 %dir %{_sysconfdir}/cgi.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
 %attr(755,root,root) %{_bindir}/php.cgi
-%{_bindir}/php.fcgi
+%attr(755,root,root) %{_bindir}/php.fcgi
 
 %files cli
 %defattr(644,root,root,755)
@@ -2596,33 +2595,17 @@
 
 %files tests
 %defattr(644,root,root,755)
-%dir /usr/share/php/tests
-/usr/share/php/tests/quicktester.inc
-%attr(755,root,root) /usr/share/php/tests/run-tests.php
-
-%dir /usr/share/php/tests/basic
-/usr/share/php/tests/basic/*
-
-%dir /usr/share/php/tests/classes
-/usr/share/php/tests/classes/*
-
-%dir /usr/share/php/tests/func
-/usr/share/php/tests/func/*
-
-%dir /usr/share/php/tests/lang
-/usr/share/php/tests/lang/*
-
-%dir /usr/share/php/tests/output
-/usr/share/php/tests/output/*
-
-%dir /usr/share/php/tests/run-test
-/usr/share/php/tests/run-test/*
-
-%dir /usr/share/php/tests/security
-/usr/share/php/tests/security/*
-
-%dir /usr/share/php/tests/strings
-/usr/share/php/tests/strings/*
+%dir %{php_data_dir}/tests/php
+%{php_data_dir}/tests/php/basic
+%{php_data_dir}/tests/php/classes
+%{php_data_dir}/tests/php/func
+%{php_data_dir}/tests/php/lang
+%{php_data_dir}/tests/php/output
+%{php_data_dir}/tests/php/run-test
+%{php_data_dir}/tests/php/security
+%{php_data_dir}/tests/php/strings
+%{php_data_dir}/tests/php/quicktester.inc
+%attr(755,root,root) %{php_data_dir}/tests/php/run-tests.php
 
 %if %{with tidy}
 %files tidy
@@ -2686,6 +2669,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.30  2009/04/17 10:43:56  glen
+- php subdir in tests
+- fileinfo is now shared module
+- sqlite3 ext install fails with error cannot find -lsybtcl
+
 Revision 1.688.2.29  2009/04/15 23:50:14  zergin
 - php-cgi Provides: webserver(php) as php-fcgi used to
 - new snap 200904152030
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.29&r2=1.688.2.30&f=u

