From df605a8131721b080784ab6b2b97da94fc33b1c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Nov 2012 13:45:18 +0100 Subject: php 5.4: sync with rawhide, clarify Licenses, missing provides xmlreader and xmlwriter, modernize spec --- php54.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 12 deletions(-) diff --git a/php54.spec b/php54.spec index 759613d..d3ec4f0 100644 --- a/php54.spec +++ b/php54.spec @@ -66,11 +66,14 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.4.9 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.1.%{?snapdate}%{?rcver}%{?dist} +Release: 0.2.%{?snapdate}%{?rcver}%{?dist} %else Release: 5%{?dist} %endif -License: PHP +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM is licensed under BSD +License: PHP and Zend and BSD Group: Development/Languages URL: http://www.php.net/ @@ -200,6 +203,10 @@ executing PHP scripts, /usr/bin/php, and the CGI interface. %package fpm Group: Development/Languages Summary: PHP FastCGI Process Manager +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM and fpm are licensed under BSD +License: PHP and Zend and BSD Requires: php-common%{?_isa} = %{version}-%{release} Requires(pre): /usr/sbin/useradd %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 @@ -228,6 +235,10 @@ any size, especially busier sites. %package common Group: Development/Languages Summary: Common files for PHP +# All files licensed under PHP version 3.01, except +# fileinfo is licensed under PHP version 3.0 +# regex, libmagic are licensed under BSD +License: PHP and BSD # ABI/API check - Arch specific Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix} Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix} @@ -304,6 +315,8 @@ need to install this package. %package imap Summary: A module for PHP applications that use IMAP Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: mod_php3-imap, stronghold-php-imap BuildRequires: krb5-devel, openssl-devel, libc-client-devel @@ -321,6 +334,8 @@ and the php package. %package ldap Summary: A module for PHP applications that use LDAP Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: mod_php3-ldap, stronghold-php-ldap BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel @@ -337,6 +352,8 @@ need to install this package in addition to the php package. %package pdo Summary: A database access abstraction module for PHP applications Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo # ABI/API check - Arch specific @@ -354,6 +371,8 @@ databases. %package mysql Summary: A module for PHP applications that use MySQL databases Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database Provides: php-mysqli = %{version}-%{release} @@ -374,6 +393,8 @@ this package and the php package. %package mysqlnd Summary: A module for PHP applications that use MySQL databases Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database Provides: php-mysql = %{version}-%{release} @@ -395,6 +416,8 @@ This package use the MySQL Native Driver %package pgsql Summary: A PostgreSQL database module for PHP Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa} @@ -414,6 +437,8 @@ php package. %package process Summary: Modules for PHP script using system process interfaces Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-posix, php-posix%{?_isa} Provides: php-sysvsem, php-sysvsem%{?_isa} @@ -427,9 +452,12 @@ support to PHP using system interfaces for inter-process communication. %package odbc +Summary: A module for PHP applications that use ODBC databases Group: Development/Languages +# All files licensed under PHP version 3.01, except +# pdo_odbc is licensed under PHP version 3.0 +License: PHP Requires: php-pdo%{?_isa} = %{version}-%{release} -Summary: A module for PHP applications that use ODBC databases Provides: php_database Provides: php-pdo_odbc, php-pdo_odbc%{?_isa} Obsoletes: stronghold-php-odbc @@ -446,9 +474,11 @@ applications, you will need to install this package and the php package. %package soap +Summary: A module for PHP applications that use the SOAP protocol Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} -Summary: A module for PHP applications that use the SOAP protocol BuildRequires: libxml2-devel Obsoletes: php53-soap, php53u-soap, php54-soap @@ -459,6 +489,8 @@ support to PHP for using the SOAP web services protocol. %package interbase Summary: A module for PHP applications that use Interbase/Firebird databases Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP BuildRequires: firebird-devel Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database @@ -483,6 +515,8 @@ License. %package oci8 Summary: A module for PHP applications that use OCI8 databases Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP BuildRequires: oracle-instantclient-devel >= %{oraclever} Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database @@ -501,6 +535,8 @@ support for accessing OCI8 databases to PHP. %package snmp Summary: A module for PHP applications that query SNMP-managed devices Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp BuildRequires: net-snmp-devel Obsoletes: php53-snmp, php53u-snmp, php54-snmp @@ -514,12 +550,16 @@ will need to install this package and the php package. %package xml Summary: A module for PHP applications which use XML Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php-domxml, php-dom Provides: php-dom, php-dom%{?_isa} Provides: php-xsl, php-xsl%{?_isa} Provides: php-domxml, php-domxml%{?_isa} Provides: php-wddx, php-wddx%{?_isa} +Provides: php-xmlreader, php-xmlreader%{?_isa} +Provides: php-xmlwriter, php-xmlwriter%{?_isa} BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1 Obsoletes: php53-xml, php53u-xml, php54-xml @@ -531,6 +571,9 @@ and performing XSL transformations on XML documents. %package xmlrpc Summary: A module for PHP applications which use the XML-RPC protocol Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libXMLRPC is licensed under BSD +License: PHP and BSD Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php53-xmlrpc, php53u-xmlrpc, php54-xmlrpc @@ -541,6 +584,11 @@ support for the XML-RPC protocol to PHP. %package mbstring Summary: A module for PHP applications which need multi-byte string handling Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libmbfl is licensed under LGPLv2 +# onigurama is licensed under BSD +# ucgendat is licensed under OpenLDAP +License: PHP and LGPLv2 and BSD and OpenLDAP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php53-mbstring, php53u-mbstring, php54-mbstring @@ -551,6 +599,9 @@ support for multi-byte string handling to PHP. %package gd Summary: A module for PHP applications for using the gd graphics library Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libgd is licensed under BSD +License: PHP and BSD Requires: php-common%{?_isa} = %{version}-%{release} # Required to build the bundled GD library BuildRequires: libjpeg-devel, libpng-devel, freetype-devel @@ -564,6 +615,9 @@ support for using the gd graphics library to PHP. %package bcmath Summary: A module for PHP applications for using the bcmath library Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libbcmath is licensed under LGPLv2+ +License: PHP and LGPLv2+ Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php53-bcmath, php53u-bcmath, php54-bcmath @@ -574,6 +628,8 @@ support for using the bcmath library to PHP. %package dba Summary: A database abstraction layer module for PHP applications Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php53-dba, php53u-dba, php54-dba @@ -584,6 +640,8 @@ support for using the DBA database abstraction layer to PHP. %package mcrypt Summary: Standard PHP module provides mcrypt library support Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libmcrypt-devel Obsoletes: php53-mcrypt, php53u-mcrypt, php54-mcrypt @@ -595,6 +653,8 @@ support for using the mcrypt library to PHP. %package tidy Summary: Standard PHP module provides tidy library support Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libtidy-devel Obsoletes: php53-tidy, php53u-tidy, php54-tidy @@ -606,6 +666,8 @@ support for using the tidy library to PHP. %package mssql Summary: MSSQL database module for PHP Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP Requires: php-pdo%{?_isa} = %{version}-%{release} BuildRequires: freetds-devel Provides: php-pdo_dblib, php-pdo_dblib%{?_isa} @@ -633,6 +695,8 @@ into applications to provide PHP scripting language support. %package pspell Summary: A module for PHP applications for using pspell interfaces Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: aspell-devel >= 0.50.0 Obsoletes: php53-pspell, php53u-pspell, php54-pspell @@ -644,6 +708,8 @@ support for using the pspell library to PHP. %package recode Summary: A module for PHP applications for using the recode library Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: recode-devel Obsoletes: php53-recode, php53u-recode, php54-recode @@ -655,6 +721,8 @@ support for using the recode library to PHP. %package intl Summary: Internationalization extension for PHP applications Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libicu-devel >= 3.6 Obsoletes: php53-intl, php53u-intl, php54-intl @@ -666,6 +734,8 @@ support for using the ICU library to PHP. %package enchant Summary: Human Language and Character Encoding Support Group: System Environment/Libraries +# All files licensed under PHP version 3.0 +License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: enchant-devel >= 1.2.4 Obsoletes: php53-enchant, php53u-enchant, php54-enchant @@ -716,7 +786,15 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 cp Zend/LICENSE Zend/ZEND_LICENSE cp TSRM/LICENSE TSRM_LICENSE cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT -cp ext/gd/libgd/README gd_README +cp ext/gd/libgd/README libgd_README +cp ext/gd/libgd/COPYING libgd_COPYING +cp sapi/fpm/LICENSE fpm_LICENSE +cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE +cp ext/mbstring/oniguruma/COPYING oniguruma_COPYING +cp ext/mbstring/ucgendat/OPENLDAP_LICENSE ucgendat_LICENSE +cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE +cp ext/phar/LICENSE phar_LICENSE +cp ext/bcmath/libbcmath/COPYING.LIB libbcmath_COPYING # Multiple builds for multiple SAPIs mkdir build-cgi build-apache build-embedded build-zts build-ztscli \ @@ -1117,8 +1195,6 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ %endif %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - # Install the extensions for the ZTS version make -C build-ztscli install \ INSTALL_ROOT=$RPM_BUILD_ROOT @@ -1325,9 +1401,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \ # Remove irrelevant docs rm -f README.{Zeus,QNX,CVS-RULES} -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -rm files.* macros.php %pre common echo -e "\nWARNING : These %{name}-* RPM are not official Fedora/Redhat build and" @@ -1433,6 +1506,8 @@ fi %defattr(-,root,root) %doc CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS README* %doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT +%doc libmagic_LICENSE +%doc phar_LICENSE %doc php.ini-* %config(noreplace) %{_sysconfdir}/php.ini %dir %{_sysconfdir}/php.d @@ -1460,6 +1535,7 @@ fi %files fpm %defattr(-,root,root) %doc php-fpm.conf.default +%doc fpm_LICENSE %config(noreplace) %{_sysconfdir}/php-fpm.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm @@ -1508,11 +1584,16 @@ fi %files xml -f files.xml %files xmlrpc -f files.xmlrpc %files mbstring -f files.mbstring +%doc libmbfl_LICENSE +%doc oniguruma_COPYING +%doc ucgendat_LICENSE %files gd -f files.gd %defattr(-,root,root,-) -%doc gd_README +%doc libgd_README +%doc libgd_COPYING %files soap -f files.soap %files bcmath -f files.bcmath +%doc libbcmath_COPYING %files dba -f files.dba %files pdo -f files.pdo %files mcrypt -f files.mcrypt @@ -1532,7 +1613,15 @@ fi %changelog -* Thu Nov 8 2012 Remi Collet 5.4.9-0.1.RC1 +* Fri Nov 9 2012 Remi Collet 5.4.9-0.2.RC1 +- sync with rawhide + +* Fri Nov 9 2012 Remi Collet 5.4.8-6 +- clarify Licenses +- missing provides xmlreader and xmlwriter +- modernize spec + +* Thu Nov 8 2012 Remi Collet 5.4.9-0.1.RC1 - update to 5.4.9RC1 - change php embedded library soname version to 5.4 -- cgit