diff --git a/php-adodb.spec b/php-adodb.spec index fdd4b84..b673a9a 100644 --- a/php-adodb.spec +++ b/php-adodb.spec @@ -1,15 +1,18 @@ %global tarballversion %(echo %{version} | tr -d '.') +%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}} Name: php-adodb Summary: Database abstraction layer for PHP Version: 5.15 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD or LGPLv2+ URL: http://adodb.sf.net Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# for macros +BuildRequires: httpd-devel Source0: http://downloads.sourceforge.net/adodb/adodb%{tarballversion}.zip @@ -38,11 +41,11 @@ find . -type f | xargs chmod 644 %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_var}/www/icons +install -d $RPM_BUILD_ROOT%{_httpd_contentdir}/icons install -d $RPM_BUILD_ROOT%{_datadir}/php/adodb cp -pr * $RPM_BUILD_ROOT%{_datadir}/php/adodb/ -install -m644 cute_icons_for_site/* $RPM_BUILD_ROOT%{_var}/www/icons/ +install -m644 cute_icons_for_site/* $RPM_BUILD_ROOT%{_httpd_contentdir}/icons # cleanup rm -rf $RPM_BUILD_ROOT%{_datadir}/php/adodb/cute_icons_for_site @@ -56,9 +59,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc *.txt docs/* %{_datadir}/php/adodb -%{_var}/www/icons/* +%{_httpd_contentdir}/icons/* %changelog +* Fri Dec 4 2013 Remi Collet - 5.15-3 +- fix icons locations for httpd 2.4 (#876907) + * Fri Jul 20 2012 Fedora Release Engineering - 5.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild