[php-pear-HTTP-Request] doc in /usr/share/doc/pear
Remi Collet
remi at fedoraproject.org
Sun Apr 17 08:08:23 UTC 2011
commit 4396c3d2aac7731fcaa67da464e7eba649484c66
Author: remi <fedora at famillecollet.com>
Date: Sun Apr 17 10:08:27 2011 +0200
doc in /usr/share/doc/pear
php-pear-HTTP-Request.spec | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/php-pear-HTTP-Request.spec b/php-pear-HTTP-Request.spec
index 693d9a1..c52eb5c 100644
--- a/php-pear-HTTP-Request.spec
+++ b/php-pear-HTTP-Request.spec
@@ -3,7 +3,7 @@
Name: php-pear-HTTP-Request
Version: 1.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provides an easy way to perform HTTP requests
Group: Development/Libraries
@@ -43,14 +43,10 @@ cd %{pear_name}-%{version}
%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 $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -59,8 +55,8 @@ install -d $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# Fix rpmlint warnings
-sed -i 's/\r//' docdir/%{pear_name}/docs/example.php
-sed -i 's/\r//' docdir/%{pear_name}/docs/download-progress.php
+sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs/example.php
+sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs/download-progress.php
%clean
@@ -80,12 +76,15 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP
%changelog
+* Sun Apr 17 2011 Remi Collet <Fedora at FamilleCollet.com> 1.4.4-4
+- doc in /usr/share/doc/pear
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list