[php-pear-Crypt-CHAP] clean spec
Remi Collet
remi at fedoraproject.org
Thu Aug 26 17:38:58 UTC 2010
commit ecdaa4111dad994cbbd084f010ad48989360d8bd
Author: remi <fedora at famillecollet.com>
Date: Thu Aug 26 19:38:53 2010 +0200
clean spec
.gitignore | 1 +
php-pear-Crypt-CHAP.spec | 24 +++++++++++++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88b93f6..dd6696a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Crypt_CHAP-1.0.2.tgz
+package.xml
diff --git a/php-pear-Crypt-CHAP.spec b/php-pear-Crypt-CHAP.spec
index e216969..79de96b 100644
--- a/php-pear-Crypt-CHAP.spec
+++ b/php-pear-Crypt-CHAP.spec
@@ -1,5 +1,5 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Crypt_CHAP
+%global pear_name Crypt_CHAP
Name: php-pear-Crypt-CHAP
Version: 1.0.2
@@ -20,16 +20,22 @@ Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
%description
-This package provides Classes for generating CHAP packets. Currently these
-types of CHAP are supported: CHAP-MD5, MS-CHAPv1, MS-CHAPv2. For MS-CHAP the
-mhash and mcrypt extensions must be loaded.
+This package provides Classes for generating CHAP packets.
+Currently these types of CHAP are supported:
+- CHAP-MD5,
+- MS-CHAPv1,
+- MS-CHAPv2.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{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
@@ -40,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 %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
@@ -74,6 +80,10 @@ fi
%changelog
+* Thu Aug 26 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-2
+- clean define
+- set date.timezone during build
+
* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
- Upstream sync
More information about the scm-commits
mailing list