Keep libraries in %{_libdir}/vtk, use ld.so.conf.d
This commit is contained in:
parent
ec8139c8fc
commit
028343be81
26
vtk.spec
26
vtk.spec
|
@ -7,7 +7,7 @@
|
||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 5.8.0
|
Version: 5.8.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
# For all intents, it has the same rights and restrictions as BSD.
|
# For all intents, it has the same rights and restrictions as BSD.
|
||||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||||
|
@ -212,10 +212,13 @@ if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then
|
||||||
mkdir -p %{buildroot}%{_libdir}
|
mkdir -p %{buildroot}%{_libdir}
|
||||||
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
|
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
|
||||||
fi
|
fi
|
||||||
mv %{buildroot}%{_libdir}/vtk/lib*.so* %{buildroot}%{_libdir}/
|
|
||||||
|
# ld config
|
||||||
|
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
||||||
|
echo %{_libdir}/vtk > %{buildroot}%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
|
||||||
|
|
||||||
# Gather list of non-python/tcl libraries
|
# Gather list of non-python/tcl libraries
|
||||||
ls %{buildroot}%{_libdir}/*.so.* \
|
ls %{buildroot}%{_libdir}/vtk/*.so.* \
|
||||||
| grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
| grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||||
|
|
||||||
# List of executable utilities
|
# List of executable utilities
|
||||||
|
@ -283,8 +286,7 @@ done
|
||||||
cat libs.list utils.list > main.list
|
cat libs.list utils.list > main.list
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Make shared libs and scripts executable
|
# Make scripts executable
|
||||||
chmod a+x %{buildroot}%{_libdir}/lib*.so.*
|
|
||||||
chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl
|
chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl
|
||||||
chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl}
|
chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl}
|
||||||
|
|
||||||
|
@ -333,6 +335,7 @@ rm -rf %{buildroot}
|
||||||
%files -f build/main.list
|
%files -f build/main.list
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc --parents Copyright.txt README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README*
|
%doc --parents Copyright.txt README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README*
|
||||||
|
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
@ -340,14 +343,14 @@ rm -rf %{buildroot}
|
||||||
%{_bindir}/vtkWrapHierarchy
|
%{_bindir}/vtkWrapHierarchy
|
||||||
%{_libdir}/vtk/doxygen
|
%{_libdir}/vtk/doxygen
|
||||||
%{_includedir}/vtk
|
%{_includedir}/vtk
|
||||||
%{_libdir}/*.so
|
%{_libdir}/vtk/*.so
|
||||||
%{_libdir}/vtk/CMake
|
%{_libdir}/vtk/CMake
|
||||||
%{_libdir}/vtk/*.cmake
|
%{_libdir}/vtk/*.cmake
|
||||||
%{_libdir}/vtk/hints
|
%{_libdir}/vtk/hints
|
||||||
|
|
||||||
%files tcl
|
%files tcl
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/*TCL.so.*
|
%{_libdir}/vtk/*TCL.so.*
|
||||||
%{_bindir}/vtk
|
%{_bindir}/vtk
|
||||||
%{_bindir}/vtkWrapTcl
|
%{_bindir}/vtkWrapTcl
|
||||||
%{_bindir}/vtkWrapTclInit
|
%{_bindir}/vtkWrapTclInit
|
||||||
|
@ -358,7 +361,7 @@ rm -rf %{buildroot}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
#%{python_sitearch}/vtk
|
#%{python_sitearch}/vtk
|
||||||
%{python_sitearch}/*
|
%{python_sitearch}/*
|
||||||
%{_libdir}/*PythonD.so.*
|
%{_libdir}/vtk/*PythonD.so.*
|
||||||
%{_bindir}/vtkpython
|
%{_bindir}/vtkpython
|
||||||
%{_bindir}/vtkWrapPython
|
%{_bindir}/vtkWrapPython
|
||||||
%{_bindir}/vtkWrapPythonInit
|
%{_bindir}/vtkWrapPythonInit
|
||||||
|
@ -366,7 +369,7 @@ rm -rf %{buildroot}
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
%files java
|
%files java
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/*Java.so.*
|
%{_libdir}/vtk/*Java.so.*
|
||||||
%{_libdir}/vtk/java
|
%{_libdir}/vtk/java
|
||||||
%{_bindir}/vtkParseJava
|
%{_bindir}/vtkParseJava
|
||||||
%{_bindir}/vtkWrapJava
|
%{_bindir}/vtkWrapJava
|
||||||
|
@ -374,7 +377,7 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
%files qt
|
%files qt
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libQVTK.so.*
|
%{_libdir}/vtk/libQVTK.so.*
|
||||||
%{_libdir}/qt4/plugins/designer
|
%{_libdir}/qt4/plugins/designer
|
||||||
|
|
||||||
%files testing -f build/testing.list
|
%files testing -f build/testing.list
|
||||||
|
@ -386,6 +389,9 @@ rm -rf %{buildroot}
|
||||||
%doc vtk-examples/Examples
|
%doc vtk-examples/Examples
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 1 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-2
|
||||||
|
- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d
|
||||||
|
|
||||||
* Fri Oct 7 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-1
|
* Fri Oct 7 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-1
|
||||||
- Update to 5.8.0
|
- Update to 5.8.0
|
||||||
- Drop version from directory names
|
- Drop version from directory names
|
||||||
|
|
Loading…
Reference in New Issue