--- rpms/php-pear-Date-Holidays-Australia/sme10/php-pear-Date_Holidays_Australia.spec 2016/06/16 06:52:41 1.2 +++ rpms/php-pear-Date-Holidays-Australia/sme10/php-pear-Date_Holidays_Australia.spec 2016/06/16 07:16:46 1.3 @@ -20,7 +20,6 @@ BuildRequires: php-pear(PEAR) >= 1.4.7 Requires: php-pear(Date_Holidays) >= 0.18.0 Requires: php-pear(PEAR) >= 1.4.0b1 Provides: php-pear(%{pear_name}) = %{version} -BuildRequires: e-smith-devtools >= 1.11.0-12 #BuildRequires: PEAR::PEAR >= 1.4.7 #Requires: PEAR::Date_Holidays >= 0.18.0 @@ -55,12 +54,16 @@ rm pearrc rm %{buildroot}/%{peardir}/.filemap rm %{buildroot}/%{peardir}/.lock rm -rf %{buildroot}/%{peardir}/.registry -rm -rf %{buildroot}%{peardir}/.channels -if [[ -f %{buildroot}%{peardir}/.depdb ]] ;then -rm %{buildroot}%{peardir}/.depdb +rm -rf %{buildroot}/%{peardir}/.channels +rm %{buildroot}/%{xmldir}/.filemap +rm %{buildroot}/%{xmldir}/.lock +rm -rf %{buildroot}/%{xmldir}/.registry +rm -rf %{buildroot}/%{xmldir}/.channels +if [[ -f %{buildroot}%{xmldir}/.depdb ]] ;then +rm %{buildroot}%{xmldir}/.depdb fi -if [[ -f %{buildroot}%{peardir}/.depdblock ]] ;then -rm %{buildroot}%{peardir}/.depdblock +if [[ -f %{buildroot}{xmldir}/.depdblock ]] ;then +rm %{buildroot}%{xmldir}/.depdblock fi @@ -68,14 +71,10 @@ fi # Install XML package description mkdir -p %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml -mv package.xml %{buildroot}%{xmldir}/Date_Holidays_Australia.xml - -rm -f %{name}-%{version}-%{release}-filelist -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - > %{name}-%{version}-%{release}-filelist +cp -p package.xml %{buildroot}%{xmldir}/Date_Holidays_Australia.xml %clean -#rm -rf %{buildroot} +rm -rf %{buildroot} %post pear install --nodeps --soft --force --register-only %{xmldir}/Date_Holidays_Australia.xml >/dev/null || : @@ -85,11 +84,11 @@ if [ "$1" -eq "0" ]; then pear uninstall --nodeps --ignore-errors --register-only pear.php.net/Date_Holidays_Australia >/dev/null || : fi -%files -f %{name}-%{version}-%{release}-filelist +%files %defattr(-,root,root) -#%{peardir}/* -#%{xmldir}/Date_Holidays_Australia.xml +%{peardir}/* +%{xmldir}/Date_Holidays_Australia.xml %changelog * Thu Jun 16 2016 Jean-Philipe Pialasse 0.2.2-2.sme