rpms/php-pear-DB/FC-5 php-pear-DB.spec,1.2,1.3
Tim Jackson (timj)
fedora-extras-commits at redhat.com
Wed Jun 28 10:39:50 UTC 2006
Author: timj
Update of /cvs/extras/rpms/php-pear-DB/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15577
Modified Files:
php-pear-DB.spec
Log Message:
Fix bug #196764 - tests installed in wrong directory
Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/FC-5/php-pear-DB.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-DB.spec 10 Feb 2006 14:32:55 -0000 1.2
+++ php-pear-DB.spec 28 Jun 2006 10:39:50 -0000 1.3
@@ -1,9 +1,10 @@
%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)
+%define xmldir %{peardir}/.pkgxml
Summary: PEAR: Database Abstraction Layer
Name: php-pear-DB
Version: 1.7.6
-Release: 4
+Release: 6
License: The PHP License
Group: Development/Libraries
Source0: http://pear.php.net/get/DB-%{version}.tgz
@@ -43,7 +44,7 @@
-d doc_dir=/docs \
-d bin_dir=%{_bindir} \
-d data_dir=%{peardir}/data \
- -d test_dir=%{peardir}/tests \
+ -d test_dir=%{peardir}/test \
-d ext_dir=%{_libdir} \
-s
@@ -54,27 +55,28 @@
pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0}
# Clean up unnecessary files
-rm -f pearrc
-rm -f %{buildroot}%{peardir}/.filemap
-rm -f %{buildroot}%{peardir}/.lock
+rm pearrc
+rm %{buildroot}%{peardir}/.filemap
+rm %{buildroot}%{peardir}/.lock
rm -rf %{buildroot}%{peardir}/.registry
rm -rf %{buildroot}%{peardir}/.channels
-rm -rf %{buildroot}%{peardir}/.depdb*
+rm %{buildroot}%{peardir}/.depdb
+rm %{buildroot}%{peardir}/.depdblock
# Sort out documentation
mv %{buildroot}/docs/DB/* .
rm -rf %{buildroot}/docs
# Install XML package description
-mkdir -p %{buildroot}%{_libdir}/php/pear
+mkdir -p %{buildroot}%{xmldir}
tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{_libdir}/php/pear/DB.xml
+cp -p package.xml %{buildroot}%{xmldir}/DB.xml
%clean
rm -rf %{buildroot}
%post
-pear install --nodeps --soft --force --register-only %{_libdir}/php/pear/DB.xml >/dev/null
+pear install --nodeps --soft --force --register-only %{xmldir}/DB.xml >/dev/null
%postun
if [ "$1" -eq "0" ]; then
@@ -84,12 +86,20 @@
%files
%defattr(-,root,root)
%doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS
-%{_libdir}/php/pear/DB.xml
-%{peardir}/tests/DB
+%{xmldir}/DB.xml
+%{peardir}/test/DB
%{peardir}/DB.php
%{peardir}/DB
%changelog
+* Wed Jun 28 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-6
+- Move tests to peardir/test instead of peardir/tests (bug #196764)
+
+* Wed May 17 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-5
+- Moved package XML file to %{peardir}/.pkgxml (see bug #190252)
+- Abstracted package XML directory
+- Removed some "-f"s on rm's to avoid masking possible errors
+
* Tue Jan 24 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-4
- Move package XML file to _libdir/php/pear rather than _var/lib/pear
More information about the fedora-extras-commits
mailing list