summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-02 10:01:35 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-02 10:01:35 +0200
commit8199a038c2fd61912368edc2a661215f0aa5ce66 (patch)
treec1c67b8db0cca7b53dc42d317d9915e9443cb8ca
parentc0bd3b871dc9236101c2e5f251e109fb55fcb676 (diff)
php-pear-CodeGen-PECL: backportHEADmaster
-rw-r--r--php-pear-CodeGen-PECL.spec18
1 files changed, 7 insertions, 11 deletions
diff --git a/php-pear-CodeGen-PECL.spec b/php-pear-CodeGen-PECL.spec
index 9912862..e011b60 100644
--- a/php-pear-CodeGen-PECL.spec
+++ b/php-pear-CodeGen-PECL.spec
@@ -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,16 @@ 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 <RPMS@FamilleCollet.com> - 1.1.3-6
+- doc in /usr/share/doc/pear
+- backport for remi repo
+
* Sun Jul 22 2012 Robert Scheck <robert@fedoraproject.org> 1.1.3-6
- Added patch to generate PHP 5.4 compilable C code