[php-pear-File-SMBPasswd] clean spec

[Remi Collet]

commit bea517e6bec8b44ac989368d694c7d133bc975ae
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 28 13:50:40 2010 +0200

    clean spec

 .gitignore                   |    1 +
 php-pear-File-SMBPasswd.spec |   31 +++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9565596..c9058b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 File_SMBPasswd-1.0.3.tgz
+package.xml
diff --git a/php-pear-File-SMBPasswd.spec b/php-pear-File-SMBPasswd.spec
index a471aca..39a405c 100644
--- a/php-pear-File-SMBPasswd.spec
+++ b/php-pear-File-SMBPasswd.spec
@@ -1,33 +1,38 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name File_SMBPasswd
+%global pear_name File_SMBPasswd
 
 Name:           php-pear-File-SMBPasswd
 Version:        1.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class for managing SAMBA style password files
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://pear.php.net/package/File_SMBPasswd
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-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:       php-pear(PEAR) php-pear(Crypt_CHAP) >= 1.0.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
 
 %description
-With this package, you can maintain smbpasswd-files, usualy used by SAMBA.
+With this package, you can maintain smbpasswd-files, usually used by SAMBA.
 
 
 %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
@@ -38,7 +43,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
@@ -49,7 +54,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}
 
 
 %clean
@@ -58,7 +63,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 +75,18 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %dir %{pear_phpdir}/File
 %{pear_phpdir}/File/SMBPasswd.php
 
 
 %changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.3-2
+- clean define
+- rename File_SMBPasswd.xml to php-pear-File-SMBPasswd.xml
+- set date.timezone during build
+- fix typo in descr.
+
 * Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.0.3-1
 - Upstream sync