packages: ParaView/ParaView.spec - merged useless packages - verbose files ...

[baggins]

Author: baggins                      Date: Fri Feb 17 14:07:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged useless packages
- verbose files
- general cleanup

---- Files affected:
packages/ParaView:
   ParaView.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/ParaView/ParaView.spec
diff -u packages/ParaView/ParaView.spec:1.2 packages/ParaView/ParaView.spec:1.3
--- packages/ParaView/ParaView.spec:1.2	Fri Feb 17 12:41:25 2012
+++ packages/ParaView/ParaView.spec	Fri Feb 17 15:07:32 2012
@@ -2,7 +2,7 @@
 Summary:	Parallel visualization application
 Name:		ParaView
 Version:	3.12.0
-Release:	0.1
+Release:	0.2
 License:	BSD
 Group:		Applications/Engineering
 URL:		http://www.paraview.org/
@@ -41,12 +41,12 @@
 BuildRequires:	tk-devel
 BuildRequires:	wget
 BuildRequires:	zlib-devel
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-doc = %{version}-%{release}
 Requires(post):	desktop-file-utils
 Requires(postun):	desktop-file-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	lib.*Python.*\.so.*
+
 %description
 ParaView is an application designed with the need to visualize large
 data sets in mind. The goals of the ParaView project include the
@@ -67,15 +67,6 @@
 NOTE: The version in this package has NOT been compiled with MPI
 support.
 
-%package        data
-Summary:	Data files for ParaView
-Group:		Applications/Engineering
-Requires:	%{name} = %{version}-%{release}
-BuildArch:	noarch
-
-%description    data
-Data files for ParaView.
-
 %package        devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
@@ -85,15 +76,6 @@
 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
-Requires:	%{name} = %{version}-%{release}
-BuildArch:	noarch
-
-%description    doc
-Documentation files for ParaView.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -139,19 +121,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_datadir}/mime/packages}
 
-install %SOURCE1 $RPM_BUILD_ROOT%{_pixmapsdir}
-install %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
 cd build
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 #Create desktop file
-cat > $RPM_BUILD_ROOT%{_desktopdir}/paraview.desktop <<EOF
+cat > $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
 Name=ParaView Viewer
@@ -159,17 +139,17 @@
 Comment=ParaView allows viewing of large data sets
 Type=Application
 Terminal=false
-Icon=paraview_22x22
+Icon=ParaView_22x22
 MimeType=application/x-paraview;
 Categories=Application;Graphics;
 Exec=paraview
 EOF
 
-#Install vtk*Python.so by hand for now
+# Install vtk*Python.so by hand for now
 cp -p bin/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
 mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
 
-#Cleanup vtk binaries
+# Cleanup vtk binaries
 rm $RPM_BUILD_ROOT%{_bindir}/vtk*
 
 %clean
@@ -178,15 +158,11 @@
 %post
 /sbin/ldconfig
 %update_desktop_database
+%update_mime_database
 
 %postun
 /sbin/ldconfig
 %update_desktop_database
-
-%post data
-%update_mime_database
-
-%postun data
 %update_mime_database
 
 %files
@@ -200,13 +176,35 @@
 %attr(755,root,root) %{_bindir}/pvrenderserver
 %attr(755,root,root) %{_bindir}/pvserver
 %attr(755,root,root) %{_bindir}/smTestDriver
-%{_libdir}/paraview/
-
-%files data
-%defattr(644,root,root,755)
-%{_desktopdir}/fedora-paraview.desktop
-%{_pixmapsdir}/paraview_22x22.png
-%{_datadir}/mime/packages/paraview.xml
+%dir %{_libdir}/paraview/
+%attr(755,root,root) %{_libdir}/paraview/paraview
+%attr(755,root,root) %{_libdir}/paraview/pvbatch
+%attr(755,root,root) %{_libdir}/paraview/pvdataserver
+%attr(755,root,root) %{_libdir}/paraview/pvpython
+%attr(755,root,root) %{_libdir}/paraview/pvrenderserver
+%attr(755,root,root) %{_libdir}/paraview/pvserver
+%attr(755,root,root) %{_libdir}/paraview/smTestDriver
+%attr(755,root,root) %{_libdir}/paraview/lib*.so*
+%{_libdir}/paraview/CMake
+%{_libdir}/paraview/*.cmake
+%{_libdir}/paraview/doc
+%{_libdir}/paraview/*.py
+%{_libdir}/paraview/testing
+%{_libdir}/paraview/.plugins
+%{_libdir}/paraview/SESAMEConversions.xml
+%{_libdir}/paraview/hints
+%{_libdir}/paraview/ParaViewCore
+%dir %{_libdir}/paraview/site-packages
+%dir %{_libdir}/paraview/site-packages/paraview
+%{_libdir}/paraview/site-packages/paraview/pv_compile_complete
+%{_libdir}/paraview/site-packages/paraview/*.py*
+%attr(755,root,root) %{_libdir}/paraview/site-packages/paraview/*.so
+%{_libdir}/paraview/site-packages/paraview/demos
+%{_libdir}/paraview/site-packages/paraview/vtk
+%{_desktopdir}/ParaView.desktop
+%{_pixmapsdir}/ParaView_22x22.png
+%{_datadir}/mime/packages/ParaView.xml
+%{_datadir}/doc/paraview-3.12/paraview.qch
 
 %files devel
 %defattr(644,root,root,755)
@@ -219,6 +217,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/02/17 14:07:32  baggins
+- merged useless packages
+- verbose files
+- general cleanup
+
 Revision 1.2  2012/02/17 11:41:25  baggins
 - updated BR
 - adapter
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ParaView/ParaView.spec?r1=1.2&r2=1.3&f=u