[php-pear-DB-QueryTool] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 09:27:43 UTC 2013
commit 62a5d8a73f35498f71b6d6d00e383c3dea335974
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 10:27:37 2013 +0100
fix metadata location
php-pear-DB-QueryTool.spec | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/php-pear-DB-QueryTool.spec b/php-pear-DB-QueryTool.spec
index 63f2fa4..f000efa 100644
--- a/php-pear-DB-QueryTool.spec
+++ b/php-pear-DB-QueryTool.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name DB_QueryTool
Name: php-pear-DB-QueryTool
Version: 1.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: An OO-interface for easily retrieving and modifying data in a DB
Group: Development/Libraries
@@ -13,7 +14,7 @@ Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
+BuildRequires: php-pear
Requires: php-pear(PEAR) php-pear(DB) php-pear(Log)
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -27,10 +28,6 @@ build queries.
%prep
%setup -qc
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
cd %{pear_name}-%{version}
# package.xml is V2
mv ../package.xml %{name}.xml
@@ -42,13 +39,9 @@ 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
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -75,13 +68,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/DB/QueryTool*
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 0.9.1-11
+- fix metadata location
+- doc in /usr/share/doc/pear
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list