- Fix multilib conflicts in *.pyc and *.pyo files.

- Only install unversioned *.so file for Python bindings.
This commit is contained in:
Richard W.M. Jones 2011-01-14 16:00:01 +00:00
parent 448cbe3a7b
commit 3822fde201

View File

@ -7,7 +7,7 @@
Name: hivex Name: hivex
Version: 1.2.4 Version: 1.2.4
Release: 4%{?dist} Release: 6%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries Group: Development/Libraries
@ -171,11 +171,11 @@ find $RPM_BUILD_ROOT -name '*.bs' -delete
rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.a rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.a
rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ]; then # Only install unversioned *.so file for Python bindings.
mkdir -p $RPM_BUILD_ROOT%{python_sitelib} rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.so
mv $RPM_BUILD_ROOT%{python_sitearch}/hivex.py* \ mv $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.so.0.0.0 \
$RPM_BUILD_ROOT%{python_sitelib}/ $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.so
fi rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.so.0*
%find_lang %{name} %find_lang %{name}
@ -249,13 +249,17 @@ rm -rf $RPM_BUILD_ROOT
%files -n python-%{name} %files -n python-%{name}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitearch}/* %{python_sitearch}/*.py
%{python_sitelib}/*.py %{python_sitearch}/*.pyc
%{python_sitelib}/*.pyc %{python_sitearch}/*.pyo
%{python_sitelib}/*.pyo %{python_sitearch}/*.so
%changelog %changelog
* Fri Jan 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-6
- Fix multilib conflicts in *.pyc and *.pyo files.
- Only install unversioned *.so file for Python bindings.
* Wed Jan 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-4 * Wed Jan 5 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-4
- Rebuild against OCaml 3.12.0. - Rebuild against OCaml 3.12.0.