[php-pear-Net-Traceroute] doc in /usr/share/doc/pear

Remi Collet remi at fedoraproject.org
Mon Apr 18 18:12:45 UTC 2011


commit d9c794b16f46225f3cead2e6f8bf292264315211
Author: remi <fedora at famillecollet.com>
Date:   Mon Apr 18 20:12:48 2011 +0200

    doc in /usr/share/doc/pear

 .gitignore                   |    1 +
 php-pear-Net-Traceroute.spec |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e15de7..2ff40f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+package-*.xml
 Net_Traceroute-0.21.2.tgz
 /Net_Traceroute-0.21.3.tgz
diff --git a/php-pear-Net-Traceroute.spec b/php-pear-Net-Traceroute.spec
index 3ad9530..600251f 100644
--- a/php-pear-Net-Traceroute.spec
+++ b/php-pear-Net-Traceroute.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Net-Traceroute
 Version:        0.21.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Execute traceroute
 
 Group:          Development/Libraries
@@ -48,10 +48,6 @@ rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
-# Move documentation
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
-
-
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -77,13 +73,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
 %exclude %{pear_datadir}
 
 
 %changelog
+* Mon Apr 18 2011 Remi Collet <Fedora at FamilleCollet.com> 0.21.3-3
+- doc in /usr/share/doc/pear
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list