[php-pear-Pager/el6/master] clean spec
Remi Collet
remi at fedoraproject.org
Sat Aug 28 07:36:32 UTC 2010
commit eb1093edb4da5ca1eb530348708371f9f1e8ec4c
Author: remi <fedora at famillecollet.com>
Date: Sat Aug 28 09:27:53 2010 +0200
clean spec
.gitignore | 1 +
php-pear-Pager.spec | 25 +++++++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6624fc7..ca1e847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Pager-2.4.8.tgz
+package.xml
diff --git a/php-pear-Pager.spec b/php-pear-Pager.spec
index 1ec587a..ba7aea6 100644
--- a/php-pear-Pager.spec
+++ b/php-pear-Pager.spec
@@ -1,9 +1,9 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Pager
+%global pear_name Pager
Name: php-pear-Pager
Version: 2.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Data paging class
Group: Development/Libraries
@@ -29,9 +29,13 @@ window style.
%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
@@ -42,7 +46,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
@@ -53,7 +57,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}
# Fix rpmlint warning
sed -i 's/\r//' docdir/%{pear_name}/examples/example.php
@@ -64,7 +68,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
@@ -76,12 +80,17 @@ fi
%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/%{pear_name}*
%changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 2.4.8-2
+- clean define
+- rename Pager.xml to php-pear-Pager.xml
+- set date.timezone during build
+
* Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 2.4.8-1
- Upstream sync
More information about the scm-commits
mailing list