diff --git a/php-pear-Date-Holidays-USA.spec b/php-pear-Date-Holidays-USA.spec index 869c099..2418a77 100644 --- a/php-pear-Date-Holidays-USA.spec +++ b/php-pear-Date-Holidays-USA.spec @@ -1,9 +1,10 @@ +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name Date_Holidays_USA Name: php-pear-Date-Holidays-USA Version: 0.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Driver based class to calculate holidays in USA Group: Development/Languages @@ -26,10 +27,6 @@ special celebrations. This is the driver for calculating holidays in USA. %prep %setup -qc -# Create a "localized" php.ini to avoid build warning -cp /etc/php.ini . -echo "date.timezone=UTC" >>php.ini - cd %{pear_name}-%{version} # Package is V2 mv ../package.xml %{name}.xml @@ -41,12 +38,12 @@ cd %{pear_name}-%{version} %install +rm -rf $RPM_BUILD_ROOT cd %{pear_name}-%{version} -rm -rf $RPM_BUILD_ROOT docdir -PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??* # Install XML package description install -d $RPM_BUILD_ROOT%{pear_xmldir} @@ -77,6 +74,9 @@ fi %changelog +* Tue Feb 19 2013 Remi Collet - 0.1.1-11 +- fix metadata location + * Thu Feb 14 2013 Fedora Release Engineering - 0.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild