On 7/5/07, Olly Betts <olly@survex.com> wrote:> I've now uploaded Xapian 1.0.2, which you can download from the usual
> place:
>
> http://www.xapian.org/download.php
>
When I build the xapian-bindings RPM, the file /usr/share/php5/xapian.php
is installed. Am I right to assume not packaging it will not prevent the
PHP bindings from functioning correctly ?
The following patch ghosts that file, and also replaces /usr/share with
_datadir.
Fabrice
--- xapian-bindings.spec_bak 2007-07-05 08:44:55.000000000 +0800
+++ xapian-bindings.spec 2007-07-05 12:02:27.000000000 +0800
@@ -121,10 +121,10 @@
# DESTDIR instead of makeinstall.
make install DESTDIR=%{buildroot}
# Move the docs to the right places.
-%{?!_without_python: mv %{buildroot}/usr/share/doc/%{name}/python
%{buildroot}/usr/share/doc/%{name}-python-%{version}}
-%{?!_without_php: mv %{buildroot}/usr/share/doc/%{name}/php
%{buildroot}/usr/share/doc/%{name}-php-%{version}}
-%{?!_without_tcl8: mv %{buildroot}/usr/share/doc/%{name}/tcl8
%{buildroot}/usr/share/doc/%{name}-tcl8-%{version}}
-%{?!_without_csharp: mv %{buildroot}/usr/share/doc/%{name}/csharp
%{buildroot}/usr/share/doc/%{name}-csharp-%{version}}
+%{?!_without_python: mv %{buildroot}%{_datadir}/doc/%{name}/python
%{buildroot}%{_datadir}/doc/%{name}-python-%{version}}
+%{?!_without_php: mv %{buildroot}%{_datadir}/doc/%{name}/php
%{buildroot}%{_datadir}/doc/%{name}-php-%{version}}
+%{?!_without_tcl8: mv %{buildroot}%{_datadir}/doc/%{name}/tcl8
%{buildroot}%{_datadir}/doc/%{name}-tcl8-%{version}}
+%{?!_without_csharp: mv %{buildroot}%{_datadir}/doc/%{name}/csharp
%{buildroot}%{_datadir}/doc/%{name}-csharp-%{version}}
%clean
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -141,21 +141,22 @@
%{_libdir}/python%{python_ver}/site-packages/xapian.py
%{_libdir}/python%{python_ver}/site-packages/xapian.pyc
%ghost %{_libdir}/python%{python_ver}/site-packages/xapian.pyo
-%doc /usr/share/doc/%{name}-python-%{version}
+%doc %{_datadir}/doc/%{name}-python-%{version}
%endif
%if 0%{?!_without_php:1}
%files php
%defattr(-, root, root)
%{php_extension_dir}/xapian.so
-%doc /usr/share/doc/%{name}-php-%{version}
+%ghost %{_datadir}/php*
+%doc %{_datadir}/doc/%{name}-php-%{version}
%endif
%if 0%{?!_without_tcl8:1}
%files tcl8
%defattr(-, root, root)
-/usr/share/xapian%{version}
-%doc /usr/share/doc/%{name}-tcl8-%{version}
+%{_datadir}/xapian%{version}
+%doc %{_datadir}/doc/%{name}-tcl8-%{version}
%endif
%if 0%{?!_without_csharp:1}
@@ -165,5 +166,5 @@
%{_libdir}/XapianSharp.so
%{_libdir}/mono/XapianSharp
%{_libdir}/mono/gac/XapianSharp
-%doc /usr/share/doc/%{name}-csharp-%{version}
+%doc %{_datadir}/doc/%{name}-csharp-%{version}
%endif