From: Marcin Krol Date: Sun, 30 Jun 2013 19:37:17 +0000 (+0000) Subject: - dropped PLD stuff X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=738e8f9cb2bf2d817c2fe7abd3e2a2fe2a538394;p=packages%2Fphp.git - dropped PLD stuff --- diff --git a/php.spec b/php.spec index ef16134..75d93e0 100644 --- a/php.spec +++ b/php.spec @@ -250,11 +250,7 @@ BuildRequires: libpng-devel >= 1.0.8 #BuildRequires: libtiff-devel %{?with_webp:BuildRequires: libvpx-devel} BuildRequires: tokyocabinet-devel -%if "%{pld_release}" != "ac" BuildRequires: libtool >= 2:2.2 -%else -BuildRequires: libtool >= 1.4.3 -%endif #BuildRequires: libwrap-devel BuildRequires: libxml2-devel >= 1:2.7.6-4 BuildRequires: libxslt-devel >= 1.1.0 @@ -440,9 +436,7 @@ Provides: php(cgi) Provides: php(fcgi) Provides: webserver(php) = %{version} Obsoletes: php-fcgi < 4:5.3.0 -%if "%{pld_release}" != "ac" Conflicts: logrotate < 3.8.0 -%endif %description cgi PHP as CGI or FastCGI program. @@ -556,11 +550,7 @@ Group: Development/Languages/PHP Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: autoconf >= 2.13 Requires: automake -%if "%{pld_release}" != "ac" Requires: libtool >= 2:2.2 -%else -Requires: libtool -%endif %{?with_pcre:Requires: pcre-devel >= 8.10} Requires: shtool Obsoletes: php-devel @@ -1886,9 +1876,7 @@ cp -p php.ini-production php.ini %patch27 -p1 %patch29 -p1 %patch31 -p1 -%if "%{pld_release}" != "ac" %patch34 -p1 -%endif %patch35 -p1 %patch36 -p1 %patch37 -p1 @@ -2426,9 +2414,6 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm install -d $RPM_BUILD_ROOT/etc/logrotate.d cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm -%if "%{pld_release}" == "ac" -%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm -%endif %{__sed} -i -e ' s#/usr/lib/php#%{php_extensiondir}# @@ -2493,16 +2478,11 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d} # use system automake and {lib,sh}tool -%if "%{pld_release}" != "ac" - ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build - for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do - ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build - done - ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build -%else - ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build - ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build -%endif +ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build +for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do + ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build +done +ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build # for php-pecl-mailparse