summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php54.spec15
1 files changed, 9 insertions, 6 deletions
diff --git a/php54.spec b/php54.spec
index 56f4ec8..dcd0a86 100644
--- a/php54.spec
+++ b/php54.spec
@@ -1,4 +1,3 @@
-%global contentdir /var/www
# API/ABI check
%global apiver 20100412
%global zendver 20100525
@@ -48,6 +47,7 @@
# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
+%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}}
%if 0%{?fedora} < 17 && 0%{?rhel} < 7
%global with_libzip 0
@@ -67,7 +67,7 @@ Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.4.9
%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.3.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.4.%{?snapdate}%{?rcver}%{?dist}
%else
Release: 5%{?dist}
%endif
@@ -1245,8 +1245,8 @@ make -C build-apache install-modules \
# Install the default configuration file and icons
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
-install -m 644 php.gif $RPM_BUILD_ROOT%{contentdir}/icons/php.gif
+install -m 755 -d $RPM_BUILD_ROOT%{_httpd_contentdir}/icons
+install -m 644 php.gif $RPM_BUILD_ROOT%{_httpd_contentdir}/icons/php.gif
# For third-party packaging:
install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php
@@ -1420,7 +1420,7 @@ getent group apache >/dev/null || \
groupadd -g 48 -r apache
getent passwd apache >/dev/null || \
useradd -r -u 48 -g apache -s /sbin/nologin \
- -d %{contentdir} -c "Apache" apache
+ -d %{_httpd_contentdir} -c "Apache" apache
exit 0
%post fpm
@@ -1500,7 +1500,7 @@ fi
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
%config(noreplace) %{_httpd_modconfdir}/10-php.conf
%endif
-%{contentdir}/icons/php.gif
+%{_httpd_contentdir}/icons/php.gif
%files common -f files.common
%defattr(-,root,root)
@@ -1613,6 +1613,9 @@ fi
%changelog
+* Thu Nov 15 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.4.RC1
+- use _httpd_contentdir macro and fix php.gif path
+
* Wed Nov 14 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.3.RC1
- improve system libzip patch to use pkg-config