From ad5f98910c721925df50d505bbf45b82b90eaf38 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 8 May 2013 12:40:47 +0000 Subject: [PATCH] - dropped pld stuff - added 53 suffix - dropped release to 1 (name change: php -> php53) --- php53.spec | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/php53.spec b/php53.spec index ea6cd43..6692dbd 100644 --- a/php53.spec +++ b/php53.spec @@ -111,14 +111,9 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %endif %define orgname php -%if "%{pld_release}" == "ac_" %define php_suffix 53 -%define _noautoreqdep libphp_common.* -%else -%define php_suffix %{nil} -%endif -%define rel 3 +%define rel 1 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -238,11 +233,7 @@ BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 BuildRequires: libpng-devel >= 1.0.8 #BuildRequires: libtiff-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 @@ -429,9 +420,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. @@ -510,11 +499,6 @@ Requires: glibc >= 6:2.3.5 Requires: php-dirs >= 1.4 Requires: rpm-whiteout >= 1.28 Requires: tzdata -%if "%{pld_release}" == "ac" -# postpone tree rebuild in ac -Provides: php5(debug) = %{php_debug} -Provides: php5(thread-safety) = %{zend_zts} -%endif Provides: %{name}(debug) = %{php_debug} Provides: %{name}(modules_api) = %{php_api_version} Provides: %{name}(thread-safety) = %{zend_zts} @@ -562,11 +546,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_embed:Requires: %{name}-embedded = %{epoch}:%{version}-%{release}} %{?with_pcre:Requires: pcre-devel >= 8.10} Requires: shtool @@ -1925,9 +1905,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 @@ -2438,9 +2416,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}# @@ -2503,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 %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build # for php-pecl-mailparse -- 2.46.0