SPECS: php-pecl-xdebug.spec - build with older libtool - simplify build dir...

glen glen at pld-linux.org
Tue Oct 14 20:10:23 CEST 2008


Author: glen                         Date: Tue Oct 14 18:10:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with older libtool
- simplify build dir structure

---- Files affected:
SPECS:
   php-pecl-xdebug.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-xdebug.spec
diff -u SPECS/php-pecl-xdebug.spec:1.52 SPECS/php-pecl-xdebug.spec:1.53
--- SPECS/php-pecl-xdebug.spec:1.52	Mon Aug 11 09:33:41 2008
+++ SPECS/php-pecl-xdebug.spec	Tue Oct 14 20:10:18 2008
@@ -15,9 +15,9 @@
 Source1:	%{name}.ini
 URL:		http://pecl.php.net/package/xdebug/
 BuildRequires:	libedit-devel
-BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libtool
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.344
+BuildRequires:	rpmbuild(macros) >= 1.465
 Requires:	%{_sysconfdir}/conf.d
 %{?requires_zend_extension}
 Conflicts:	ZendOptimizer
@@ -67,13 +67,13 @@
 
 %prep
 %setup -q -c
-chmod +x %{_modname}-%{version}/debugclient/configure
-cp %{SOURCE1} %{_modname}.ini
-sed -e 's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{extensionsdir}/%{_modname}.so#' -i %{_modname}.ini
+mv %{_modname}-%{version}/* .
+rmdir %{_modname}-%{version}
+chmod +x debugclient/configure
 
-%build
-cd %{_modname}-%{version}
+sed -e 's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{extensionsdir}/%{_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
@@ -96,7 +96,7 @@
 %{__make}
 cd debugclient
 install /usr/share/automake/{config.*,depcomp} .
-%{__libtoolize} --install
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %configure \
@@ -107,8 +107,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/conf.d,%{extensionsdir}}
 
-install %{_modname}-*/debugclient/debugclient $RPM_BUILD_ROOT%{_bindir}/%{_modname}-debugclient
-install %{_modname}-*/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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
 
 %clean
@@ -124,7 +124,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_modname}-*/{README,NEWS,Changelog,CREDITS,xt.vim}
+%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}/*
@@ -135,6 +135,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2008/10/14 18:10:18  glen
+- build with older libtool
+- simplify build dir structure
+
 Revision 1.52  2008/08/11 07:33:41  glen
 - kill the noise
 
================================================================

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



More information about the pld-cvs-commit mailing list