From 4a4c714baabb4e0bb54ce24412c6efc9e5277225 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 02 2011 05:03:08 +0000 Subject: Re-add devel sub-packages --- diff --git a/paraview.spec b/paraview.spec index 0df4d16..a9f644b 100644 --- a/paraview.spec +++ b/paraview.spec @@ -56,7 +56,6 @@ Requires(post): /usr/bin/update-desktop-database Requires(postun): /usr/bin/update-desktop-database Obsoletes: paraview-demos < %{version}-%{release} Provides: paraview-demos = %{version}-%{release} -Obsoletes: paraview-devel < %{version}-%{release} Obsoletes: paraview-doc < %{version}-%{release} Provides: paraview-doc = %{version}-%{release} @@ -90,6 +89,7 @@ Provides: paraview-doc = %{version}-%{release} -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\ -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\ -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\ + -DPV_INSTALL_INCLUDE_DIR:PATH=include/paraview \\\ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \\\ -DVTK_USE_BOOST:BOOL=ON \\\ @@ -144,21 +144,6 @@ This package contains copies of the ParaView server binaries compiled with OpenMPI. These are named pvserver_openmpi, pvbatch_openmpi, etc. You will need to load the openmpi-%{_arch} module to setup your path properly. -%endif - -%if %{build_mpich2} -%package mpich2 -Summary: Parallel visualization application -Group: Applications/Engineering -Requires: %{name}-data = %{version}-%{release} -Requires: mpich2 - -%description mpich2 -This package contains copies of the ParaView server binaries compiled with -mpich2. These are named pvserver_mpich2, pvbatch_mpich2, etc. - -You will need to load the mpich2-%{_arch} module to setup your path properly. -%endif %package data @@ -173,6 +158,16 @@ BuildArch: noarch %{summary}. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + %package doc Summary: Documentation files for ParaView Group: Applications/Engineering @@ -186,6 +181,41 @@ BuildArch: noarch %prep +%package openmpi-devel +Summary: Development files for %{name}-openmpi +Group: Development/Libraries +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} + +%description openmpi-devel +The %{name}-openmpi-devel package contains libraries and header files for +developing applications that use %{name}-openmpi. +%endif + +%if %{build_mpich2} +%package mpich2 +Summary: Parallel visualization application +Group: Applications/Engineering +Requires: %{name}-data = %{version}-%{release} +Requires: mpich2 + +%description mpich2 +This package contains copies of the ParaView server binaries compiled with +mpich2. These are named pvserver_mpich2, pvbatch_mpich2, etc. + +You will need to load the mpich2-%{_arch} module to setup your path properly. + + +%package mpich2-devel +Summary: Development files for %{name}-mpich2 +Group: Development/Libraries +Requires: %{name}-mpich2%{?_isa} = %{version}-%{release} + +%description mpich2-devel +The %{name}-mpich2-devel package contains libraries and header files for +developing applications that use %{name}-mpich2. +%endif + + %setup -q -n ParaView-%{version}%{?rcver} %patch1 -p1 -b .include %patch7 -p1 -b .hdf5 @@ -364,7 +394,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files -%defattr(-,root,root,-) %doc License_v1.2.txt %{_bindir}/paraview %{_bindir}/pvbatch @@ -376,10 +405,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/smTestDriver %{_libdir}/paraview/ +%files data +%{_datadir}/applications/fedora-paraview.desktop +%{_datadir}/pixmaps/paraview_22x22.png +%{_datadir}/mime/packages/paraview.xml + +%files devel +%{_includedir}/paraview/ + %if %{build_openmpi} %files openmpi -%defattr(-,root,root,-) %doc License_v1.2.txt %{_libdir}/openmpi/bin/pvbatch_openmpi %{_libdir}/openmpi/bin/pvdataserver_openmpi @@ -387,12 +423,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/openmpi/bin/pvserver_openmpi %{_libdir}/openmpi/bin/smTestDriver_openmpi %{_libdir}/openmpi/lib/paraview + +%files openmpi-devel +%{_libdir}/openmpi/include/paraview/ %endif %if %{build_mpich2} %files mpich2 -%defattr(-,root,root,-) %doc License_v1.2.txt %{_libdir}/mpich2/bin/pvbatch_mpich2 %{_libdir}/mpich2/bin/pvdataserver_mpich2 @@ -400,14 +438,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/mpich2/bin/pvserver_mpich2 %{_libdir}/mpich2/bin/smTestDriver_mpich2 %{_libdir}/mpich2/lib/paraview -%endif - -%files data -%defattr(-,root,root,-) -%{_datadir}/applications/fedora-paraview.desktop -%{_datadir}/pixmaps/paraview_22x22.png -%{_datadir}/mime/packages/paraview.xml +%files mpich2-devel +%{_libdir}/mpich2/include/paraview/ +%endif %changelog