[php-pear-CodeGen-PECL] doc in /usr/share/doc/pear per PHP Guildelines

Remi Collet remi at fedoraproject.org
Thu Aug 2 08:06:59 UTC 2012


commit f47cc18283a83d932cca5925274cdeb8a4540228
Author: remi <fedora at famillecollet.com>
Date:   Thu Aug 2 10:06:54 2012 +0200

    doc in /usr/share/doc/pear per PHP Guildelines

 php-pear-CodeGen-PECL.spec |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/php-pear-CodeGen-PECL.spec b/php-pear-CodeGen-PECL.spec
index fb198d9..b5d0843 100644
--- a/php-pear-CodeGen-PECL.spec
+++ b/php-pear-CodeGen-PECL.spec
@@ -4,7 +4,7 @@
 Summary:           Tool to generate PECL extensions from an XML description
 Name:              php-pear-CodeGen-PECL
 Version:           1.1.3
-Release:           6%{?dist}
+Release:           7%{?dist}
 License:           PHP
 Group:             Development/Languages
 URL:               http://pear.php.net/package/%{pear_name}
@@ -29,10 +29,6 @@ extension.
 %setup -qc
 %patch0 -p0 -b .php54
 
-# Create a "localized" php.ini to avoid build warning
-cp -pf /etc/php.ini .
-echo "date.timezone=UTC" >> php.ini
-
 # Package is V2
 cd %{pear_name}-%{version}
 mv -f ../package.xml %{name}.xml
@@ -42,13 +38,9 @@ cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mkdir -p docdir
-mv -f $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs docdir/%{pear_name}
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -70,12 +62,15 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc %{pear_docdir}/%{pear_name}
 %{_bindir}/pecl-gen
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/CodeGen/PECL/
 
 %changelog
+* Thu Aug 02 2012 Remi Collet <remi at fedoraproject.org> - 1.1.3-7
+- doc in /usr/share/doc/pear per PHP Guildelines
+
 * Sun Jul 22 2012 Robert Scheck <robert at fedoraproject.org> 1.1.3-6
 - Added patch to generate PHP 5.4 compilable C code
 


More information about the scm-commits mailing list