[php-pear-Log] doc in %%{pear_docdir}

Remi Collet remi at fedoraproject.org
Fri Mar 25 16:23:31 UTC 2011


commit e5cac80b022b5192c4b5fe8d914e451d2108b6d0
Author: remi <fedora at famillecollet.com>
Date:   Fri Mar 25 17:23:13 2011 +0100

    doc in %%{pear_docdir}

 php-pear-Log.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/php-pear-Log.spec b/php-pear-Log.spec
index 743f360..1581275 100644
--- a/php-pear-Log.spec
+++ b/php-pear-Log.spec
@@ -5,7 +5,7 @@ Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
 Version:        1.12.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
@@ -52,6 +52,9 @@ php-pear-Log peut optionnellement utiliser les extensions
 cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
 
+# Link from pear doc to package doc
+%{__ln_s} %{pear_docdir}/%{pear_name} %{pear_name}
+
 cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
@@ -62,7 +65,7 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
 pushd Log-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -75,9 +78,6 @@ rm -rf %{buildroot}%{pear_phpdir}/.??*
 %{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
-# Sort out documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
-mv %{buildroot}%{pear_docdir}/%{pear_name}/examples docdir/examples
 
 
 %clean
@@ -108,7 +108,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG %{pear_name}
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
@@ -117,6 +118,9 @@ fi
 
 
 %changelog
+* Wed Mar 16 2011 Remi Collet <Fedora at FamilleCollet.com> 1.12.5-3
+- doc in %%{pear_docdir}
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list