diff --git a/php-ezc-Base.spec b/php-ezc-Base.spec index 1db01ff..bd3b40a 100644 --- a/php-ezc-Base.spec +++ b/php-ezc-Base.spec @@ -4,7 +4,7 @@ Name: php-ezc-Base Version: 1.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Provides the basic infrastructure that all packages rely on Group: Development/Libraries @@ -32,8 +32,8 @@ Therefore every component relies on this package. %prep %setup -q -c -[ -f package2.xml ] || %{__mv} package.xml package2.xml -%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml +[ -f package2.xml ] || mv package.xml package2.xml +mv package2.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} # This are really doc, not data, not used in the code @@ -48,29 +48,29 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -%{__rm} -rf %{buildroot} -%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml +rm -rf %{buildroot} +pear install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files -%{__rm} -rf %{buildroot}%{pear_phpdir}/.??* +rm -rf %{buildroot}%{pear_metadir}/.??* # Install XML package description -%{__mkdir} -p %{buildroot}%{pear_xmldir} -%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} +mkdir -p %{buildroot}%{pear_xmldir} +install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post -%{__pear} install --nodeps --soft --force --register-only \ +pear install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ + pear uninstall --nodeps --ignore-errors --register-only \ %{channel}/%{pear_name} >/dev/null || : fi @@ -86,6 +86,9 @@ fi %changelog +* Mon Mar 11 2013 Guillaume Kulakowski - 1.8-7 +- Fix metadata location, FTBFS #914369 + * Thu Feb 14 2013 Fedora Release Engineering - 1.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild