Author: arekm                        Date: Fri Mar  2 08:14:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; php 5.2 is back in th under new name (likely some things will need 
polishing)

---- Files affected:
packages/php52:
   php52.spec (1.978 -> 1.979) 

---- Diffs:

================================================================
Index: packages/php52/php52.spec
diff -u packages/php52/php52.spec:1.978 packages/php52/php52.spec:1.979
--- packages/php52/php52.spec:1.978     Fri Mar  2 08:59:12 2012
+++ packages/php52/php52.spec   Fri Mar  2 09:14:23 2012
@@ -106,94 +106,95 @@
 %define                magic_mime      /usr/share/misc/magic.mime
 %endif
 
+%define        orgname php
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
 Summary(pt_BR.UTF-8):  A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, 
выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, 
виконувана на сервері
-Name:          php
+Name:          php52
 Version:       5.2.17
-Release:       13
+Release:       1
 Epoch:         4
 License:       PHP
 Group:         Libraries
-Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
 # Source0-md5: b27947f3045220faf16e4d9158cbfe13
-Source2:       %{name}-mod_%{name}.conf
-Source3:       %{name}-cgi-fcgi.ini
-Source4:       %{name}-cgi.ini
-Source5:       %{name}-apache.ini
-Source6:       %{name}-cli.ini
+Source2:       %{orgname}-mod_%{orgname}.conf
+Source3:       %{orgname}-cgi-fcgi.ini
+Source4:       %{orgname}-cgi.ini
+Source5:       %{orgname}-apache.ini
+Source6:       %{orgname}-cli.ini
 # Taken from: http://browsers.garykeith.com/downloads.asp
-Source8:       %{name}_browscap.ini
+Source8:       %{orgname}_browscap.ini
 # lynx -dump ftp://distfiles.gentoo.org/pub/gentoo/distfiles/|grep -o 
ftp://.*php-patchset.*tar.bz2
-#Source9:      
ftp://distfiles.gentoo.org/pub/gentoo/distfiles/%{name}-patchset-%{version}-r1.tar.bz2
+#Source9:      
ftp://distfiles.gentoo.org/pub/gentoo/distfiles/%{orgname}-patchset-%{version}-r1.tar.bz2
 ## Source9-md5:        d67f23f5e69664e06fce89b064d5bbab
-Source10:      %{name}-fpm.init
-Source11:      %{name}-fpm.logrotate
-Source12:      %{name}-branch.sh
+Source10:      %{orgname}-fpm.init
+Source11:      %{orgname}-fpm.logrotate
+Source12:      %{orgname}-branch.sh
 Source13:      dep-tests.sh
 Source14:      skip-tests.sh
-Patch0:                %{name}-shared.patch
-Patch1:                %{name}-pldlogo.patch
-Patch2:                %{name}-mail.patch
-Patch3:                %{name}-link-libs.patch
-Patch4:                %{name}-libpq_fs_h_path.patch
-Patch5:                %{name}-filter-shared.patch
-Patch6:                %{name}-build_modules.patch
-Patch7:                %{name}-sapi-ini-file.patch
-Patch8:                %{name}-no-metaccld.patch
-Patch9:                %{name}-sh.patch
-Patch10:       %{name}-ini.patch
-Patch11:       %{name}-acam.patch
-Patch12:       %{name}-threads-acfix.patch
-Patch13:       %{name}-tsrmlsfetchgcc2.patch
-Patch14:       %{name}-no_pear_install.patch
-Patch15:       %{name}-zlib.patch
-Patch16:       %{name}-sybase-fix.patch
-Patch17:       %{name}-readline.patch
-Patch18:       %{name}-nohttpd.patch
-Patch19:       %{name}-gd_imagerotate_enable.patch
-Patch20:       %{name}-uint32_t.patch
-Patch21:       %{name}-dba-link.patch
-Patch22:       %{name}-both-apxs.patch
-Patch23:       %{name}-builddir.patch
-Patch24:       %{name}-zlib-for-getimagesize.patch
-Patch25:       %{name}-versioning.patch
-Patch26:       %{name}-pear.patch
-Patch27:       %{name}-config-dir.patch
-Patch28:       %{name}-bug-42952.patch
-Patch29:       %{name}-fcgi-graceful.patch
-Patch30:       %{name}-apr-apu.patch
-Patch31:       %{name}-fcgi-error_log-no-newlines.patch
-Patch32:       %{name}-curl-limit-speed.patch
-Patch33:       %{name}-mime_magic.patch
-Patch34:       %{name}-libtool.patch
-Patch35:       %{name}-tds.patch
-Patch36:       %{name}-mysql-charsetphpini.patch
-Patch37:       %{name}-mysqli-charsetphpini.patch
-Patch38:       %{name}-pdo_mysql-charsetphpini.patch
-Patch39:       %{name}-use-prog_sendmail.patch
-Patch40:       %{name}-fpm.patch
-Patch41:       %{name}-fpm-config.patch
-Patch42:       %{name}-fpm-initdir.patch
-Patch43:       %{name}-silent-session-cleanup.patch
-Patch44:       %{name}-include_path.patch
-Patch45:       %{name}-imap-annotations.patch
-Patch46:       %{name}-imap-myrights.patch
+Patch0:                %{orgname}-shared.patch
+Patch1:                %{orgname}-pldlogo.patch
+Patch2:                %{orgname}-mail.patch
+Patch3:                %{orgname}-link-libs.patch
+Patch4:                %{orgname}-libpq_fs_h_path.patch
+Patch5:                %{orgname}-filter-shared.patch
+Patch6:                %{orgname}-build_modules.patch
+Patch7:                %{orgname}-sapi-ini-file.patch
+Patch8:                %{orgname}-no-metaccld.patch
+Patch9:                %{orgname}-sh.patch
+Patch10:       %{orgname}-ini.patch
+Patch11:       %{orgname}-acam.patch
+Patch12:       %{orgname}-threads-acfix.patch
+Patch13:       %{orgname}-tsrmlsfetchgcc2.patch
+Patch14:       %{orgname}-no_pear_install.patch
+Patch15:       %{orgname}-zlib.patch
+Patch16:       %{orgname}-sybase-fix.patch
+Patch17:       %{orgname}-readline.patch
+Patch18:       %{orgname}-nohttpd.patch
+Patch19:       %{orgname}-gd_imagerotate_enable.patch
+Patch20:       %{orgname}-uint32_t.patch
+Patch21:       %{orgname}-dba-link.patch
+Patch22:       %{orgname}-both-apxs.patch
+Patch23:       %{orgname}-builddir.patch
+Patch24:       %{orgname}-zlib-for-getimagesize.patch
+Patch25:       %{orgname}-versioning.patch
+Patch26:       %{orgname}-pear.patch
+Patch27:       %{orgname}-config-dir.patch
+Patch28:       %{orgname}-bug-42952.patch
+Patch29:       %{orgname}-fcgi-graceful.patch
+Patch30:       %{orgname}-apr-apu.patch
+Patch31:       %{orgname}-fcgi-error_log-no-newlines.patch
+Patch32:       %{orgname}-curl-limit-speed.patch
+Patch33:       %{orgname}-mime_magic.patch
+Patch34:       %{orgname}-libtool.patch
+Patch35:       %{orgname}-tds.patch
+Patch36:       %{orgname}-mysql-charsetphpini.patch
+Patch37:       %{orgname}-mysqli-charsetphpini.patch
+Patch38:       %{orgname}-pdo_mysql-charsetphpini.patch
+Patch39:       %{orgname}-use-prog_sendmail.patch
+Patch40:       %{orgname}-fpm.patch
+Patch41:       %{orgname}-fpm-config.patch
+Patch42:       %{orgname}-fpm-initdir.patch
+Patch43:       %{orgname}-silent-session-cleanup.patch
+Patch44:       %{orgname}-include_path.patch
+Patch45:       %{orgname}-imap-annotations.patch
+Patch46:       %{orgname}-imap-myrights.patch
 Patch47:       suhosin.patch
-Patch49:       %{name}-m4-divert.patch
+Patch49:       %{orgname}-m4-divert.patch
 Patch50:       extension-shared-optional-dep.patch
 Patch51:       spl-shared.patch
-Patch52:       %{name}-libpng.patch
-Patch53:       %{name}-gmp.patch
+Patch52:       %{orgname}-libpng.patch
+Patch53:       %{orgname}-gmp.patch
 Patch54:       fix-test-run.patch
 Patch55:       bug-52078-fileinode.patch
-Patch56:       %{name}-krb5.patch
+Patch56:       %{orgname}-krb5.patch
 Patch57:       php-php_dl.patch
 Patch58:       php-svn-281516.patch
-Patch59:       %{name}-systzdata.patch
+Patch59:       %{orgname}-systzdata.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:       system-libzip.patch
 Patch66:       bug-47930.patch
@@ -624,7 +625,10 @@
 %{?with_pcre:Requires: pcre-devel >= 6.6}
 Requires:      shtool
 Obsoletes:     php-pear-devel
+Obsoletes:     php-devel
 Obsoletes:     php4-devel
+Obsoletes:     php53-devel
+Obsoletes:     php54-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -1879,7 +1883,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q
+%setup -q -n %{orgname}-%{version}
 # for suhosin patch
 %{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
 
@@ -3382,6 +3386,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.979  2012/03/02 08:14:23  arekm
+- rel 1; php 5.2 is back in th under new name (likely some things will need 
polishing)
+
 Revision 1.978  2012/03/02 07:59:12  arekm
 - state of current php.spec:PHP_5_2 placed here
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php52/php52.spec?r1=1.978&r2=1.979&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to