rpms/php-pear-Mail/devel php-pear-Mail.spec,1.1,1.2
Remi Collet (remi)
fedora-extras-commits at redhat.com
Sat Jul 22 16:21:22 UTC 2006
Author: remi
Update of /cvs/extras/rpms/php-pear-Mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8134
Modified Files:
php-pear-Mail.spec
Log Message:
use new macros from /etc/rpm/macros.pear
Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/php-pear-Mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Mail.spec 27 May 2006 07:13:04 -0000 1.1
+++ php-pear-Mail.spec 22 Jul 2006 16:21:21 -0000 1.2
@@ -1,24 +1,30 @@
-%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)
-%define xmldir %{peardir}/.pkgxml
-
-Summary: PEAR: Class that provides multiple interfaces for sending emails
-Summary(fr): PEAR: Une Classe fournissant des interfaces pour envoyer des emails
-Name: php-pear-Mail
-Version: 1.1.10
-Release: 4%{?dist}
-License: PHP License
-Group: Development/Libraries
-Source: http://pear.php.net/get/Mail-%{version}.tgz
-Source1: PHP-LICENSE-3.01
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pear.php.net/package/Mail
-BuildRequires: php-pear(PEAR) >= 1.4.9
-Provides: php-pear(Mail) = %{version}
-Requires: php-pear(PEAR) >= 1.4.9
+# default values when new /etc/rpm/macros.pear not present
+%{!?__pear: %define __pear %{_bindir}/pear}
+%{!?pear_phpdir: %define pear_phpdir %(%{__pear} config-get php_dir 2> /dev/null || echo undefined)}
+%{!?pear_docdir: %define pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo undefined)}
+%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
+%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
+%{!?pear_xmldir: %define pear_xmldir %{pear_phpdir}/.pkgxml}
+
+Summary: PEAR: Class that provides multiple interfaces for sending emails
+Summary(fr): PEAR: Une Classe fournissant des interfaces pour envoyer des emails
+Name: php-pear-Mail
+Version: 1.1.10
+Release: 5%{?dist}
+License: PHP License
+Group: Development/Libraries
+Source: http://pear.php.net/get/Mail-%{version}.tgz
+Source1: PHP-LICENSE-3.01
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://pear.php.net/package/Mail
+
+BuildArch: noarch
+BuildRequires: php-pear(PEAR) >= 1.4.9
+Requires: php-pear(PEAR) >= 1.4.9
# Requires(hint): php-pear(Net_SMTP) >= 1.1.0
-Requires(post): php-pear
-Requires(postun): php-pear
-BuildArch: noarch
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
+Provides: php-pear(Mail) = %{version}
%description
PEAR's Mail package defines an interface for implementing mailers under
@@ -42,83 +48,88 @@
"php-pear-Net-SMTP" (version >= 1.1.0).
%prep
-%setup -c -T
+%setup -c -q -T
# XXX Source files location is missing here in pear cmd
-pear -v -c pearrc \
- -d php_dir=%{peardir} \
- -d doc_dir=/docs \
+%{__pear} -v -c pearrc \
+ -d php_dir=%{pear_phpdir} \
+ -d doc_dir=%{pear_docdir} \
-d bin_dir=%{_bindir} \
- -d data_dir=%{peardir}/data \
- -d test_dir=%{peardir}/test \
+ -d data_dir=%{pear_datadir} \
+ -d test_dir=%{pear_testdir} \
-d ext_dir=%{_libdir} \
-s
+%{__install} -m 644 -c %{SOURCE1} LICENSE
+
%install
rm -rf %{buildroot}
-pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
+%{__pear} -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
-rm pearrc
-rm %{buildroot}/%{peardir}/.filemap
-rm %{buildroot}/%{peardir}/.lock
-rm -rf %{buildroot}/%{peardir}/.registry
-rm -rf %{buildroot}/%{peardir}/.channels
-rm %{buildroot}/%{peardir}/.depdb
-rm %{buildroot}/%{peardir}/.depdblock
+rm -f %{buildroot}%{pear_phpdir}/.filemap
+rm -f %{buildroot}%{pear_phpdir}/.lock
+rm -rf %{buildroot}%{pear_phpdir}/.registry
+rm -rf %{buildroot}%{pear_phpdir}/.channels
+rm %{buildroot}%{pear_phpdir}/.depdb
+rm %{buildroot}%{pear_phpdir}/.depdblock
-%{__mkdir_p} %{buildroot}%{xmldir}
+%{__mkdir_p} %{buildroot}%{pear_xmldir}
tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{xmldir}/Mail.xml
-
-%{__install} -m 644 -c %{SOURCE1} LICENSE
+cp -p package.xml %{buildroot}%{pear_xmldir}/Mail.xml
%check
# Sanity check
-lst=$(find %{buildroot}%{peardir} -exec grep -q %{buildroot} {} \; -print)
+lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
%clean
rm -rf %{buildroot}
%post
-pear install --nodeps --soft --force --register-only %{xmldir}/Mail.xml >/dev/null
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail.xml >/dev/null || :
%postun
# if refcount = 0 then package has been removed (not upgraded)
if [ "$1" -eq "0" ]; then
- pear uninstall --nodeps --ignore-errors --register-only Mail >/dev/null
+ %{__pear} uninstall --nodeps --ignore-errors --register-only Mail >/dev/null || :
fi
%files
%defattr(-,root,root)
-%{peardir}/Mail.php
-%{peardir}/Mail
-%{peardir}/test/Mail
-%{xmldir}/Mail.xml
+%{pear_phpdir}/Mail.php
+%{pear_phpdir}/Mail
+%{pear_testdir}/Mail
+%{pear_xmldir}/Mail.xml
%doc LICENSE
%changelog
-* Mon May 15 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-4.fc5
+* Sat Jul 22 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-5
+- remove "rm pearrc"
+- secure scriplet with || :
+- install Licence in prep
+- use new macros from /etc/rpm/macros.pear
+
+* Mon May 15 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-4
- Require pear >= 1:1.4.9
- Requires(hint): php-pear(Net_SMTP) >= 1.1.0 (only comment actually)
- bundle the v3.01 PHP LICENSE file
- use --packagingroot (instead of -R)
- check from install to check (as in php-pear)
-* Sun May 14 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-3.fc5
+* Sun May 14 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-3
- License : PHP -> PHP License
-* Sat May 06 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-2.fc5
+* Sat May 06 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-2
- new spec for extras
-- use %{_datadir}/pear/.pkgxml for XML (Bug #190252)
+- use %%{_datadir}/pear/.pkgxml for XML (Bug #190252)
-* Thu Apr 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-1.fc5
+* Thu Apr 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-1
- spec for extras
* Wed Apr 26 2006 Remi Collet <rpms at FamilleCollet.com> 1.1.10-1.fc{3,4,5}.remi
- update to 1.1.10
* Thu Apr 06 2006 Remi Collet <rpms at FamilleCollet.com> 1.1.9-2.fc{3,4,5}.remi
-- change /var/lib/pear to %{_libdir}/php/pear for XML (as in extras for FC5)
+- change /var/lib/pear to %%{_libdir}/php/pear for XML (as in extras for FC5)
- spec cleanning
* Sat Jan 7 2006 Remi Collet <remi.collet at univ-reims.fr> 1.1.9-1.fc{3,4}.remi
More information about the fedora-extras-commits
mailing list