[php-pear-HTML-Common/el6/master] clean spec
Remi Collet
remi at fedoraproject.org
Sat Aug 28 07:51:51 UTC 2010
commit 29ea3f0c572c206fa485ee802f984a9bd5cbb737
Author: remi <fedora at famillecollet.com>
Date: Sat Aug 28 09:46:04 2010 +0200
clean spec
.gitignore | 1 +
PHP-LICENSE-3.01 | 68 ---------------------------------------------
php-pear-HTML-Common.spec | 32 +++++++++++++--------
3 files changed, 21 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a05d360..05169c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
HTML_Common-1.2.5.tgz
+package.xml
diff --git a/php-pear-HTML-Common.spec b/php-pear-HTML-Common.spec
index b6649ab..5b7670f 100644
--- a/php-pear-HTML-Common.spec
+++ b/php-pear-HTML-Common.spec
@@ -1,20 +1,20 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name HTML_Common
+%global pear_name HTML_Common
Name: php-pear-HTML-Common
Version: 1.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Base class for other HTML classes
Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/HTML_Common
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1: PHP-LICENSE-3.01
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
@@ -29,10 +29,13 @@ attributes handling.
%prep
%setup -qc
-# package.xml is v2
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
-install -pm 644 -c %{SOURCE1} LICENSE
+# 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
@@ -43,14 +46,14 @@ 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
# Clean up unnecessary files
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
@@ -59,7 +62,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
@@ -70,12 +73,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc LICENSE
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/*
%changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.5-3
+- clean define
+- rename HTML_Common.xml to php-pear-HTML-Common.xml
+- set date.timezone during build
+- remove LICENSE (not provided by upstream)
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list