Author: glen                         Date: Wed Jun  2 15:51:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.1.0RC1
- drop pear obsoletes, it was never pear

---- Files affected:
packages/php-pecl-xdebug:
   php-pecl-xdebug.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/php-pecl-xdebug/php-pecl-xdebug.spec
diff -u packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.58 
packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.59
--- packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.58  Mon Mar  1 22:27:58 2010
+++ packages/php-pecl-xdebug/php-pecl-xdebug.spec       Wed Jun  2 17:50:56 2010
@@ -1,28 +1,25 @@
 # $Revision$, $Date$
-%define                _modname        xdebug
-%define                _status         stable
-%define                _sysconfdir     /etc/php
-%define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
-%define                beta            beta3
-Summary:       %{_modname} - provides functions for functions traces and 
profiling
-Summary(pl.UTF-8):     %{_modname} - funkcje do śledzenia i profilowania 
funkcji
-Name:          php-pecl-%{_modname}
+%define                modname xdebug
+%define                status  stable
+%define                subver  RC1
+%define                rel             1
+Summary:       %{modname} - provides functions for functions traces and 
profiling
+Summary(pl.UTF-8):     %{modname} - funkcje do śledzenia i profilowania funkcji
+Name:          php-pecl-%{modname}
 Version:       2.1.0
-Release:       0.%{beta}.1
+Release:       0.%{subver}.%{rel}
 License:       BSD style
 Group:         Development/Languages/PHP
-Source0:       http://www.xdebug.org/files/%{_modname}-%{version}%{beta}.tgz
-# Source0-md5: 51eff76e85280ea14860bcf7dbffa899
+Source0:       http://www.xdebug.org/files/xdebug-%{version}%{subver}.tgz
+# Source0-md5: 0fc89649daaf5d71f1cd6721268545e8
 Source1:       %{name}.ini
 URL:           http://www.xdebug.org/
 BuildRequires: libedit-devel
 BuildRequires: libtool
-BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.465
-Requires:      %{_sysconfdir}/conf.d
+BuildRequires: php-devel >= 3:5.0.4
+BuildRequires: rpmbuild(macros) >= 1.519
 %{?requires_zend_extension}
 Conflicts:     ZendOptimizer
-Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +39,7 @@
 - script execution analysis
 - capabilities to debug your scripts interactively with a debug client
 
-In PECL status of this package is: %{_status}.
+In PECL status of this package is: %{status}.
 
 %description -l pl.UTF-8
 Rozszerzenie Xdebug pomaga przy odpluskwianiu skryptu dostarczając
@@ -64,32 +61,31 @@
 - możliwość śledzenia skryptów interaktywnie przy pomocy klienta
   odpluskwiacza
 
-To rozszerzenie ma w PECL status: %{_status}.
+To rozszerzenie ma w PECL status: %{status}.
 
 %prep
-%setup -q -c
-mv %{_modname}-%{version}%{beta}/* .
-rmdir %{_modname}-%{version}%{beta}
+%setup -qc
+mv %{modname}-%{version}*/* .
 chmod +x debugclient/configure
 
-sed -e 
's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{extensionsdir}/%{_modname}.so#'
 %{SOURCE1} > %{_modname}.ini
+%{__sed} -e 
's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{php_extensiondir}/%{modname}.so#'
 %{SOURCE1} > %{modname}.ini
 
 %build
 # libtool 2.2 build fix
-if [ -f /usr/share/aclocal/ltsugar.m4 ]; then
-       cat /usr/share/aclocal/ltsugar.m4 >> config.m4
-       cat /usr/share/aclocal/ltsugar.m4 >> debugclient/aclocal.m4
-                                                                               
                                                                                
                                                                                
                                                                                
                                        
-       cat /usr/share/aclocal/ltversion.m4 >> config.m4
-       cat /usr/share/aclocal/ltversion.m4 >> debugclient/aclocal.m4
-                                                                               
                                                                                
                                                                                
                                                                                
                                        
-       cat /usr/share/aclocal/lt~obsolete.m4 >> config.m4
-       cat /usr/share/aclocal/lt~obsolete.m4 >> debugclient/aclocal.m4
-                                                                               
                                                                                
                                                                                
                                                                                
                                        
-       cat /usr/share/aclocal/ltoptions.m4 >> config.m4
-       cat /usr/share/aclocal/ltoptions.m4 >> debugclient/aclocal.m4
-                                                                               
                                                                                
                                                                                
                                                                                
                                        
-       cat /usr/share/aclocal/libtool.m4 >> debugclient/aclocal.m4
+if [ -f %{_aclocaldir}/ltsugar.m4 ]; then
+       cat %{_aclocaldir}/ltsugar.m4 >> config.m4
+       cat %{_aclocaldir}/ltsugar.m4 >> debugclient/aclocal.m4
+
+       cat %{_aclocaldir}/ltversion.m4 >> config.m4
+       cat %{_aclocaldir}/ltversion.m4 >> debugclient/aclocal.m4
+
+       cat %{_aclocaldir}/lt~obsolete.m4 >> config.m4
+       cat %{_aclocaldir}/lt~obsolete.m4 >> debugclient/aclocal.m4
+
+       cat %{_aclocaldir}/ltoptions.m4 >> config.m4
+       cat %{_aclocaldir}/ltoptions.m4 >> debugclient/aclocal.m4
+
+       cat %{_aclocaldir}/libtool.m4 >> debugclient/aclocal.m4
 fi
 
 phpize
@@ -106,11 +102,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d 
$RPM_BUILD_ROOT{%{_bindir},%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install debugclient/debugclient 
$RPM_BUILD_ROOT%{_bindir}/%{_modname}-debugclient
-install modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-install %{_modname}.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+install -p debugclient/debugclient 
$RPM_BUILD_ROOT%{_bindir}/%{modname}-debugclient
+install -p modules/%{modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cp -a %{modname}.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,9 +122,9 @@
 %files
 %defattr(644,root,root,755)
 %doc README NEWS Changelog CREDITS xt.vim
-%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
-%attr(755,root,root) %{_bindir}/*
+%config(noreplace) %verify(not md5 mtime size) 
%{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so
+%attr(755,root,root) %{_bindir}/xdebug-debugclient
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -136,6 +132,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2010/06/02 15:50:56  glen
+- up to 2.1.0RC1
+- drop pear obsoletes, it was never pear
+
 Revision 1.58  2010/03/01 21:27:58  arekm
 - up to 2.1.0 beta3
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-xdebug/php-pecl-xdebug.spec?r1=1.58&r2=1.59&f=u

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

Reply via email to