[php-pear-File-Passwd] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 09:55:53 UTC 2013
commit fe5401adfe1ced86fd2663b4af66e985f9af5e6b
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 10:55:46 2013 +0100
fix metadata location
php-pear-File-Passwd.spec | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/php-pear-File-Passwd.spec b/php-pear-File-Passwd.spec
index 8199e05..1748321 100644
--- a/php-pear-File-Passwd.spec
+++ b/php-pear-File-Passwd.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name File_Passwd
Name: php-pear-File-Passwd
Version: 1.1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Manipulate many kinds of password files
Group: Development/Languages
@@ -14,7 +15,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)
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -31,10 +32,6 @@ and custom formatted password files.
%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
@@ -46,23 +43,17 @@ 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
+%{__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}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-# Remove samba extension for RHEL
-%if 0%{?rhel}
-rm -f $RPM_BUILD_ROOT%{pear_phpdir}/File/Passwd/Smb.php
-rm -f $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}/tests/*smb.*
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -88,6 +79,9 @@ fi
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.1.7-8
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list