[php-pear-Cache-Lite] doc in /usr/share/doc/pear

Remi Collet remi at fedoraproject.org
Wed Apr 6 15:05:43 UTC 2011


commit be71e9996fffcf9bcc6078f36024f4e0bf87c73c
Author: remi <fedora at famillecollet.com>
Date:   Wed Apr 6 17:05:34 2011 +0200

    doc in /usr/share/doc/pear

 php-pear-Cache-Lite.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 8fe53ce..68c9968 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -5,7 +5,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.7.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -51,9 +51,9 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
-pushd %{pear_name}-%{version}
+cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
@@ -63,11 +63,6 @@ rm -rf %{buildroot}%{pear_phpdir}/.??*
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-popd
-# Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/%{pear_name}/* docdir
-
 
 %clean
 rm -rf %{buildroot}
@@ -97,13 +92,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Cache
 %{pear_testdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Wed Apr 06 2011 Remi Collet <Fedora at FamilleCollet.com> 1.7.9-2
+- doc in /usr/share/doc/pear
+
 * Wed Mar 02 2011 Remi Collet <Fedora at FamilleCollet.com> 1.7.9-1
 - Version 1.7.9 (stable) - API 1.7.7 (stable)
 - define timezone during build


More information about the scm-commits mailing list