[php-pear-DB-QueryTool/el6/master] clean spec
Remi Collet
remi at fedoraproject.org
Tue Aug 31 17:05:18 UTC 2010
commit b680723f71ef0b732fa45a12f5ff4be3c5cc927f
Author: remi <fedora at famillecollet.com>
Date: Tue Aug 31 18:58:55 2010 +0200
clean spec
php-pear-DB-QueryTool.spec | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-DB-QueryTool.spec b/php-pear-DB-QueryTool.spec
index ef0f236..40eb730 100644
--- a/php-pear-DB-QueryTool.spec
+++ b/php-pear-DB-QueryTool.spec
@@ -1,9 +1,9 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name DB_QueryTool
+%global pear_name DB_QueryTool
Name: php-pear-DB-QueryTool
Version: 1.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An OO-interface for easily retrieving and modifying data in a DB
Group: Development/Libraries
@@ -27,9 +27,13 @@ build queries.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# 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
%build
@@ -40,7 +44,7 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Move documentation
mkdir -p docdir
@@ -51,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
@@ -60,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -72,12 +76,17 @@ fi
%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/DB/QueryTool*
%changelog
+* Tue Aug 31 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.1.2-4
+- clean define
+- rename DB-QueryTool.xml to php-pear-DB-QueryTool.xml
+- set date.timezone during build
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list