diff --git a/php-ezc-Base.spec b/php-ezc-Base.spec index 2aec022..d5d12c3 100644 --- a/php-ezc-Base.spec +++ b/php-ezc-Base.spec @@ -4,7 +4,7 @@ Name: php-ezc-Base Version: 1.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Provides the basic infrastructure that all packages rely on Group: Development/Libraries @@ -36,6 +36,10 @@ Therefore every component relies on this package. %{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} +# This are really doc, not data, not used in the code +sed -e '/design/s/role="data"/role="doc"/' \ + -i %{name}.xml + %build cd %{pear_name}-%{version} @@ -44,13 +48,9 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -%{__rm} -rf %{buildroot} docdir +%{__rm} -rf %{buildroot} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml -# Move documentation -%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir -%{__rm} -rf %{buildroot}%{pear_docdir} - # Clean up unnecessary files %{__rm} -rf %{buildroot}%{pear_phpdir}/.??* @@ -77,16 +77,19 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}/docdir/* +%doc %{pear_docdir}/%{pear_name} %dir %{pear_phpdir}/ezc %dir %{pear_phpdir}/ezc/autoload %{pear_xmldir}/%{name}.xml -%{pear_phpdir}/data/%{pear_name} %{pear_phpdir}/ezc/%{pear_name} %{pear_phpdir}/ezc/autoload/base_autoload.php %changelog +* Sun Aug 19 2012 Remi Collet - 1.8-5 +- move data to doc (not used in the code, really doc) +- doc in /usr/share/doc/pear + * Fri Jul 20 2012 Fedora Release Engineering - 1.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild