diff --git a/vtk.changes b/vtk.changes index 2353dbc..1fcd4d2 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 22 17:02:27 UTC 2011 - stecue@gmail.com + +- Fix the broken vtk-qt package + ------------------------------------------------------------------- Thu Apr 14 19:59:13 UTC 2011 - badshah400@gmail.com diff --git a/vtk.spec b/vtk.spec index 12f8211..6d9b967 100644 --- a/vtk.spec +++ b/vtk.spec @@ -16,7 +16,7 @@ # -%define qtdir %{_libdir}/qt4 +%define qtdir /%{_lib}/qt4 Name: vtk Version: 5.6.1 @@ -180,6 +180,16 @@ volume rendering, LOD control). This package provides a few testing programs for VTK +%package qt +Summary: QT VTK widget +Requires: vtk = %{version} +# do not neeeded to call it, rpm take care of it +#Requires: libqt4 +Group: Development/Libraries/C and C++ + +%description qt +Qt VTK widget + %package examples Summary: Examples for VTK Group: Productivity/Scientific/Other @@ -233,7 +243,7 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" cmake . \ - -DDESIRED_QT_VERSION=4 \ + -DVTK_USE_QT:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/%{name} \ -DVTK_WRAP_PYTHON:BOOL=ON \ @@ -246,8 +256,7 @@ cmake . \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ -DVTK_USE_GUISUPPORT:BOOL=ON \ - -DVTK_USE_QVTK:BOOL=ON \ - -DVTK_INSTALL_QT_DIR:STRING=%{_libdir}/qt4/plugins/designer \ + -DVTK_INSTALL_QT_DIR:STRING=%{qtdir}/plugins/designer \ -DVTK_USE_GL2PS:BOOL=ON \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -265,14 +274,15 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ -name \*.gif | xargs chmod -x %install -mkdir -p %{buildroot} -%makeinstall +#mkdir -p %{buildroot} +#%makeinstall +make DESTDIR=%{buildroot} install mv %{buildroot}%{_libdir}/%{name}/lib*.so* %{buildroot}%{_libdir}/ # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/*.so.* \ - | grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|QVTK|Qt|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list # List of executable utilities cat > utils.list << EOF @@ -381,6 +391,10 @@ rm -rf %{buildroot} %postun java -p /sbin/ldconfig +%post qt -p /sbin/ldconfig + +%postun qt -p /sbin/ldconfig + %files -f main.list %defattr(-,root,root,-) %doc --parents Copyright.txt README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README* @@ -436,6 +450,16 @@ rm -rf %{buildroot} %doc README.html %doc vtkLogo.jpg +%files qt +%defattr(-,root,root,-) +%{_libdir}/libQVTK.so.* +%{_libdir}/libvtkQtChart.so* +#%{_bindir}/qtevents +#%{_bindir}/qtimageviewer +#%{_bindir}/qtsimpleview +%dir %{_prefix}/%{qtdir}/plugins/designer +%{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so + %files examples -f examples.list %defattr(-,root,root,-) %dir %{_libdir}/%{name}