[php-pear-Date] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 06:11:06 UTC 2013
commit 1b92d624032dcebe530575e6f6a959e4611aa7b3
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 07:06:04 2013 +0100
fix metadata location
php-pear-Date.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Date.spec b/php-pear-Date.spec
index 261e5b2..4dee914 100644
--- a/php-pear-Date.spec
+++ b/php-pear-Date.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Date
Name: php-pear-Date
Version: 1.4.7
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Date and Time Zone Classes
Group: Development/Libraries
@@ -31,10 +32,6 @@ formats.
%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 is V2
mv ../package.xml %{name}.xml
@@ -48,10 +45,10 @@ cd %{pear_name}-%{version}
%install
rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
@@ -86,6 +83,9 @@ fi
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.4.7-11
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list