SPECS (DEVEL): php.spec - started 5.1 (cpdf, dbx, dio, fam, mnogos...

arekm arekm at pld-linux.org
Thu Aug 25 16:09:50 CEST 2005


Author: arekm                        Date: Thu Aug 25 14:09:50 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy

---- Files affected:
SPECS:
   php.spec (1.467 -> 1.467.2.1) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.467 SPECS/php.spec:1.467.2.1
--- SPECS/php.spec:1.467	Tue Aug 23 12:31:11 2005
+++ SPECS/php.spec	Thu Aug 25 16:09:44 2005
@@ -5,7 +5,6 @@
 #    - mcve,
 #    - ovrimos,
 #    - pfpro,
-#    - ircg,
 #   These extensions BuildRequires proprietary libraries...
 # - deal with modules removed from php and not moved to PECL
 #   (existing only in php4):
@@ -24,16 +23,13 @@
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	oracle		# with oracle extension module		(BR: proprietary libs)
 %bcond_without	mysqli		# with mysqli support (Requires mysql > 4.1)
-%bcond_without	cpdf		# without cpdf extension module
 %bcond_without	curl		# without CURL extension module
-%bcond_without	fam		# without FAM (File Alteration Monitor) extension module
 %bcond_without	imap		# without IMAP extension module
 %bcond_with	interbase	# with InterBase extension module
 %bcond_without	ldap		# without LDAP extension module
 %bcond_without	mhash		# without mhash extension module
 %bcond_without	ming		# without ming extension module
 %bcond_without	mm		# without mm support for session storage
-%bcond_without	mnogosearch	# without mnogosearch extension module
 %bcond_without	msession	# without msession extension module
 %bcond_without	mssql		# without MS SQL extension module
 %bcond_without	odbc		# without ODBC extension module
@@ -77,13 +73,14 @@
 Summary(ru):	PHP ÷ĹŇÓÉÉ 5 - ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, ×ŮĐĎĚÎŃĹÍŮĘ ÎÁ ÓĹŇ×ĹŇĹ
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
-Version:	5.0.4
-Release:	10%{?with_hardening:hardened}
+Version:	5.1.0
+%define	_rc	RC1
+Release:	0.1%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
-Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	fb1aac107870f897d26563a9cc5053c0
+Source0:	http://www.php.net/distributions/%{name}-%{version}%{_rc}.tar.bz2
+# Source0-md5:	c7aebeb915e6f898559365cf82493ad0
 Source1:	FAQ.%{name}
 Source2:	zend.gif
 Source3:	%{name}-module-install
@@ -114,7 +111,6 @@
 Patch17:	%{name}-no_pear_install.patch
 Patch18:	%{name}-zlib.patch
 Patch19:	%{name}-sybase-fix.patch
-Patch20:	%{name}-mnogosearch-fix.patch
 Patch21:	%{name}-nohttpd.patch
 Patch22:	%{name}-lib64.patch
 Patch23:	%{name}-gd_imagerotate_enable.patch
@@ -122,7 +118,6 @@
 Patch25:	%{name}-hwapi-link.patch
 Patch26:	%{name}-dba-link.patch
 Patch27:	%{name}-install_gd_headers.patch
-Patch28:	%{name}-cpdf-fix.patch
 Patch29:	%{name}-gcc4.patch
 Patch30:	%{name}-hardening-fix.patch
 Patch31:	%{name}-both-apxs.patch
@@ -142,7 +137,6 @@
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
 %endif
-%{?with_fam:BuildRequires:	fam-devel}
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	fcgi-devel
 BuildRequires:	flex
@@ -154,7 +148,6 @@
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
 %{?with_imap:BuildRequires:	imap-devel >= 1:2001-0.BETA.200107022325.2}
-%{?with_cpdf:BuildRequires:	libcpdf-devel >= 2.02r1-2}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libmcrypt-devel >= 2.4.4
@@ -166,7 +159,6 @@
 %{?with_mhash:BuildRequires:	mhash-devel}
 %{?with_ming:BuildRequires:	ming-devel >= 0.1.0}
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
-%{?with_mnogosearch:BuildRequires:	mnogosearch-devel >= 3.2.6}
 BuildRequires:	mysql-devel >= 4.0.0
 %{?with_mysqli:BuildRequires:	mysql-devel >= 4.1.0}
 BuildRequires:	ncurses-ext-devel
@@ -195,7 +187,7 @@
 BuildRequires:	apache1-devel
 %endif
 %if %{with apache2}
-BuildRequires:	apache-devel >= 2.0.52-2
+BuildRequires:	apache-devel >= 2.0.44-1
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	apr-util-devel >= 1:1.0.0
 %endif
@@ -465,20 +457,6 @@
 %description calendar -l pl
 Moduł PHP dodający wsparcie dla kalendarza.
 
-%package cpdf
-Summary:	cpdf extension module for PHP
-Summary(pl):	Moduł cpdf dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description cpdf
-This is a dynamic shared object (DSO) for PHP that will add PDF
-support through libcpdf library.
-
-%description cpdf -l pl
-Moduł PHP dodający obsługę plików PDF poprzez bibliotekę libcpdf.
-
 %package ctype
 Summary:	ctype extension module for PHP
 Summary(pl):	Moduł ctype dla PHP
@@ -536,36 +514,6 @@
 %description dbase -l pl
 Moduł PHP ze wsparciem dla DBase.
 
-%package dbx
-Summary:	DBX extension module for PHP
-Summary(pl):	Moduł DBX dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description dbx
-This is a dynamic shared object (DSO) for PHP that will add DB
-abstraction layer. DBX supports odbc, mysql, pgsql, mssql, fbsql and
-more.
-
-%description dbx -l pl
-Moduł PHP dodający warstwę abstrakcji do obsługi baz danych. DBX
-obsługuje bazy odbc, mysql, pgsql, mssql, fbsql i inne.
-
-%package dio
-Summary:	Direct I/O extension module for PHP
-Summary(pl):	Moduł Direct I/O dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description dio
-This is a dynamic shared object (DSO) for PHP that will add direct
-file I/O support.
-
-%description dio -l pl
-Moduł PHP dodający obsługę bezpośrednich operacji I/O na plikach.
-
 %package dom
 Summary:	DOM extension module for PHP
 Summary(pl):	Moduł DOM dla PHP
@@ -597,23 +545,6 @@
 %description exif -l pl
 Moduł PHP dodający obsługę znaczników EXIF w plikach obrazków.
 
-%package fam
-Summary:	FAM (File Alteration Monitor) module for PHP
-Summary(pl):	Moduł FAM (File Alteration Monitor) dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description fam
-This PHP module adds support for FAM (File Alteration Monitor).
-FAM monitors files and directories, notifying interested applications
-of changes.
-
-%description fam -l pl
-Moduł PHP dodający obsługę dla FAM (File Alteration Monitor).
-FAM monitoruje pliki oraz katalogi, informując zainteresowane aplikacje
-o zmianach.
-
 %package fdf
 Summary:	FDF extension module for PHP
 Summary(pl):	Moduł FDF dla PHP
@@ -856,21 +787,6 @@
 Moduł PHP dodający obsługę plików Flash (.swf) poprzez bibliotekę
 ming.
 
-%package mnogosearch
-Summary:	mnoGoSearch extension module for PHP
-Summary(pl):	Moduł mnoGoSearch dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description mnogosearch
-This is a dynamic shared object (DSO) for PHP that will allow you to
-access mnoGoSearch free search engine.
-
-%description mnogosearch -l pl
-Moduł PHP dodający pozwalający na dostęp do wolnodostępnego silnika
-wyszukiwarki mnoGoSearch.
-
 %package msession
 Summary:	msession extension module for PHP
 Summary(pl):	Moduł msession dla PHP
@@ -1401,20 +1317,6 @@
 %description xsl -l pl
 Moduł PHP dodający nową obsługę XSLT (przy użyciu libxslt).
 
-%package yp
-Summary:	NIS (yp) extension module for PHP
-Summary(pl):	Moduł NIS (yp) dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description yp
-This is a dynamic shared object (DSO) for PHP that will add NIS
-(Yellow Pages) support.
-
-%description yp -l pl
-Moduł PHP dodający wsparcie dla NIS (Yellow Pages).
-
 %package zlib
 Summary:	Zlib extension module for PHP
 Summary(pl):	Moduł zlib dla PHP
@@ -1430,7 +1332,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 # this patch is broken by design, breaks --enable-versioning for example
 %patch0 -p1
 %patch1 -p1
@@ -1441,23 +1343,24 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+# FIXME; it's still needed?
+# %patch9 -p1
 cp php.ini-dist php.ini
 %patch10 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+# DROPME: not needed
+# %patch12 -p1
+# DROPME: seems not needed
+# %patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 %patch21 -p1
-%patch28 -p1
 %if "%{_lib}" == "lib64"
 %patch22 -p1
 %endif
@@ -1465,8 +1368,9 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
-%patch29 -p1
+# FIXME: ???
+# %patch27 -p1
+# %patch29 -p1
 
 %if %{with hardening}
 zcat %{SOURCE9} | patch -p1
@@ -1546,8 +1450,6 @@
 	--enable-calendar=shared \
 	--enable-ctype=shared \
 	--enable-dba=shared \
-	--enable-dbx=shared \
-	--enable-dio=shared \
 	--enable-dom=shared \
 	--enable-exif=shared \
 	--enable-filepro=shared \
@@ -1573,9 +1475,8 @@
 	--enable-ucd-snmp-hack \
 	%{?with_wddx:--enable-wddx=shared} \
 	--enable-xml=shared \
-	--enable-yp=shared \
+	--with-xmlreader \
 	--with-bz2=shared \
-	%{?with_cpdf:--with-cpdflib=shared} \
 	%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
 	%{?with_db3:--with-db3}%{!?with_db3:--with-db4} \
 	--with-dbase=shared \
@@ -1586,7 +1487,6 @@
 %endif
 	%{?with_fdf:--with-fdftk=shared} \
 	--with-iconv=shared \
-	%{?with_fam:--with-fam=shared} \
 	--with-filepro=shared \
 	--with-freetype-dir=shared \
 	--with-gettext=shared \
@@ -1597,13 +1497,12 @@
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
 	%{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \
 	--with-jpeg-dir=/usr \
-	%{?with_ldap:--with-ldap=shared} \
+	%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
 	--with-mcrypt=shared \
 	%{?with_mhash:--with-mhash=shared} \
 	--with-mime-magic=shared,/usr/share/file/magic.mime \
 	%{?with_ming:--with-ming=shared} \
 	%{?with_mm:--with-mm} \
-	%{!?with_mnogosearch:--without-mnogosearch}%{?with_mnogosearch:--with-mnogosearch=shared,/usr} \
 	%{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \
 	%{?with_mssql:--with-mssql=shared} \
 	--with-mysql=shared,/usr \
@@ -1612,6 +1511,7 @@
 	--with-ncurses=shared \
 	%{?with_oci8:--with-oci8=shared} \
 	%{?with_openssl:--with-openssl=shared} \
+	--with-kerberos \
 	%{?with_oracle:--with-oracle=shared} \
 	%{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared} \
 	--with-pear=%{php_pear_dir} \
@@ -1625,11 +1525,11 @@
 	%{?with_snmp:--with-snmp=shared} \
 	%{?with_sybase:--with-sybase=shared,/usr} \
 	%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
-	%{?with_sqlite:--with-sqlite=shared,/usr} \
+	%{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \
 	--with-t1lib=shared \
 	%{?with_tidy:--with-tidy=shared} \
 	--with-tiff-dir=/usr \
-	%{?with_odbc:--with-unixODBC=shared} \
+	%{?with_odbc:--with-unixODBC=shared,/usr} \
 	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
 	--with-xsl=shared \
 	--with-zlib=shared \
@@ -1879,12 +1779,6 @@
 %postun calendar
 %extension_postun
 
-%post cpdf
-%extension_post
-
-%postun cpdf
-%extension_postun
-
 %post ctype
 %extension_post
 
@@ -1909,18 +1803,6 @@
 %postun dbase
 %extension_postun
 
-%post dbx
-%extension_post
-
-%postun dbx
-%extension_postun
-
-%post dio
-%extension_post
-
-%postun dio
-%extension_postun
-
 %post dom
 %extension_post
 
@@ -1933,12 +1815,6 @@
 %postun exif
 %extension_postun
 
-%post fam
-%extension_post
-
-%postun fam
-%extension_postun
-
 %post fdf
 %extension_post
 
@@ -2035,12 +1911,6 @@
 %postun ming
 %extension_postun
 
-%post mnogosearch
-%extension_post
-
-%postun mnogosearch
-%extension_postun
-
 %post msession
 %extension_post
 
@@ -2272,12 +2142,6 @@
 %postun xsl
 %extension_postun
 
-%post yp
-%extension_post
-
-%postun yp
-%extension_postun
-
 %post zlib
 %extension_post
 
@@ -2293,9 +2157,6 @@
 %triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini
 
-%triggerun cpdf -- %{name}-cpdf < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove cpdf %{_sysconfdir}/php.ini
-
 %triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini
 
@@ -2308,21 +2169,12 @@
 %triggerun dbase -- %{name}-dbase < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini
 
-%triggerun dbx -- %{name}-dbx < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbx %{_sysconfdir}/php.ini
-
-%triggerun dio -- %{name}-dio < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dio %{_sysconfdir}/php.ini
-
 %triggerun dom -- %{name}-dom < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dom %{_sysconfdir}/php.ini
 
 %triggerun exif -- %{name}-exif < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini
 
-%triggerun fam -- %{name}-fam < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fam %{_sysconfdir}/php.ini
-
 %triggerun fdf -- %{name}-fdf < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fdf %{_sysconfdir}/php.ini
 
@@ -2371,9 +2223,6 @@
 %triggerun ming -- %{name}-ming < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini
 
-%triggerun mnogosearch -- %{name}-mnogosearch < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mnogosearch %{_sysconfdir}/php.ini
-
 %triggerun msession -- %{name}-msession < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini
 
@@ -2461,9 +2310,6 @@
 %triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xsl %{_sysconfdir}/php.ini
 
-%triggerun yp -- %{name}-yp < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove yp %{_sysconfdir}/php.ini
-
 %triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1
 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini
 
@@ -2544,13 +2390,6 @@
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini
 %attr(755,root,root) %{extensionsdir}/calendar.so
 
-%if %{with cpdf}
-%files cpdf
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/cpdf.ini
-%attr(755,root,root) %{extensionsdir}/cpdf.so
-%endif
-
 %files ctype
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini
@@ -2573,28 +2412,11 @@
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini
 %attr(755,root,root) %{extensionsdir}/dbase.so
 
-%files dbx
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbx.ini
-%attr(755,root,root) %{extensionsdir}/dbx.so
-
-%files dio
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dio.ini
-%attr(755,root,root) %{extensionsdir}/dio.so
-
 %files dom
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini
 %attr(755,root,root) %{extensionsdir}/dom.so
 
-%if %{with fam}
-%files fam
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fam.ini
-%attr(755,root,root) %{extensionsdir}/fam.so
-%endif
-
 %if %{with fdf}
 %files fdf
 %defattr(644,root,root,755)
@@ -2694,13 +2516,6 @@
 %attr(755,root,root) %{extensionsdir}/ming.so
 %endif
 
-%if %{with mnogosearch}
-%files mnogosearch
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mnogosearch.ini
-%attr(755,root,root) %{extensionsdir}/mnogosearch.so
-%endif
-
 %if %{with msession}
 %files msession
 %defattr(644,root,root,755)
@@ -2894,11 +2709,6 @@
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xsl.ini
 %attr(755,root,root) %{extensionsdir}/xsl.so
 
-%files yp
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/yp.ini
-%attr(755,root,root) %{extensionsdir}/yp.so
-
 %files zlib
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/zlib.ini
@@ -2910,6 +2720,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.467.2.1  2005/08/25 14:09:44  arekm
+- started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy
+
 Revision 1.467  2005/08/23 10:31:11  glen
 - rel 10 for finished conf.d support
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467&r2=1.467.2.1&f=u




More information about the pld-cvs-commit mailing list