[php-pear-Crypt-CHAP] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 05:53:44 UTC 2013
commit 7b1ca28d728da06c95e6aa40f4b2263a5c8e0e6b
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 06:53:36 2013 +0100
fix metadata location
php-pear-Crypt-CHAP.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-Crypt-CHAP.spec b/php-pear-Crypt-CHAP.spec
index 5af9ca0..0781eb9 100644
--- a/php-pear-Crypt-CHAP.spec
+++ b/php-pear-Crypt-CHAP.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Crypt_CHAP
Name: php-pear-Crypt-CHAP
Version: 1.5.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Class to generate CHAP packets
Group: Development/Languages
@@ -32,10 +33,6 @@ Currently these types of CHAP are supported:
%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
@@ -49,11 +46,11 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-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
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
@@ -66,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%check
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} run-tests \
+%{__pear} run-tests \
-i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
tests
@@ -90,6 +87,9 @@ fi
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.5.0-7
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list