orion pushed to paraview (f21). "Merge branch 'master' into f21"

Thu Apr 30 19:58:26 UTC 2015

>From 595d39e9d50ea23954136a1d6ea82db6a4428ef8 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata at redhat.com>
Date: Wed, 4 Feb 2015 14:19:22 +0100
Subject: Bump for rebuild.

diff --git a/paraview.spec b/paraview.spec
index 4587a2f..5fdd412 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -22,7 +22,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -510,6 +510,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 4.3.1-2
+- Bump for rebuild.
+
 * Tue Jan 27 2015 Orion Poplawski <orion at cora.nwra.com> - 4.3.1-1
 - Update to 4.3.1
 
-- 
cgit v0.10.2


>From d1e65b12ee02a239363518e16f42aae10f3ee695 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 29 Apr 2015 12:23:45 +0200
Subject: Rebuilt for protobuf soname bump


diff --git a/paraview.spec b/paraview.spec
index 5fdd412..65816fc 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -22,7 +22,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -510,6 +510,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Apr 29 2015 Kalev Lember <kalevlember at gmail.com> - 4.3.1-3
+- Rebuilt for protobuf soname bump
+
 * Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 4.3.1-2
 - Bump for rebuild.
 
-- 
cgit v0.10.2


>From 501a6459f4136d5d5d13bd210111fb2454ec3ef9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Wed, 29 Apr 2015 10:02:58 -0600
Subject: Use upstream desktop file (bug #1216255)


diff --git a/paraview-desktop.patch b/paraview-desktop.patch
new file mode 100644
index 0000000..10bd1a6
--- /dev/null
+++ b/paraview-desktop.patch
@@ -0,0 +1,10 @@
+diff -up ParaView-v4.3.1-source/Applications/ParaView/paraview.desktop.in.desktop ParaView-v4.3.1-source/Applications/ParaView/paraview.desktop.in
+--- ParaView-v4.3.1-source/Applications/ParaView/paraview.desktop.in.desktop	2015-01-14 06:07:33.000000000 -0700
++++ ParaView-v4.3.1-source/Applications/ParaView/paraview.desktop.in	2015-04-30 09:34:53.240264782 -0600
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@PARAVIEW_VERSION_FULL@
++Version=1.0
+ Type=Application
+ Name=ParaView
+ Comment=Parallel visualization application
diff --git a/paraview.spec b/paraview.spec
index 65816fc..1f4ef71 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -22,15 +22,17 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.paraview.org/
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?rcver}-source.tar.gz
-Source1:        paraview_22x22.png
 Source2:        paraview.xml
+# Fix Version in desktop file
+# http://www.paraview.org/Bug/view.php?id=12508
+Patch0:         paraview-desktop.patch
 # http://www.vtk.org/Bug/view.php?id=15249
 Patch2:         vtk-type.patch
 # Patch to vtk to use system netcdf library
@@ -255,6 +257,7 @@ developing applications that use %{name}-mpich.
 
 %prep
 %setup -q -n ParaView-v%{version}%{rcver}-source
+%patch0 -p1 -b .desktop
 %patch2 -p0 -b .type
 %patch3 -p0 -b .netcdf
 %patch5 -p1 -b .headers
@@ -356,8 +359,6 @@ find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px
 
 # Create some needed directories
 install -d $RPM_BUILD_ROOT%{_datadir}/applications
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
 install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
@@ -387,25 +388,7 @@ popd
 pushd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Create desktop file
-cat > paraview.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=ParaView Viewer
-GenericName=Data Viewer
-Comment=ParaView allows viewing of large data sets
-Type=Application
-Terminal=false
-Icon=paraview_22x22
-MimeType=application/x-paraview;
-Categories=Application;Graphics;
-Exec=paraview
-EOF
-
-desktop-file-install \
-       --add-category=X-Fedora \
-       --dir %{buildroot}%{_datadir}/applications/ \
-       paraview.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/paraview.desktop
 
 #Cleanup only vtk conflicting binaries
 rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},Wrap{Hierarchy,Java,Python,Tcl}}*
@@ -469,7 +452,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/applications/*paraview.desktop
 %{_datadir}/icons/hicolor/*/apps/paraview.png
 %{_datadir}/mime/packages/paraview.xml
-%{_datadir}/pixmaps/paraview_22x22.png
 %{_datadir}/paraview/
 
 %files devel
@@ -510,6 +492,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Apr 30 2015 Orion Poplawski <orion at cora.nwra.com> - 4.3.1-4
+- Use upstream desktop file (bug #1216255)
+
 * Wed Apr 29 2015 Kalev Lember <kalevlember at gmail.com> - 4.3.1-3
 - Rebuilt for protobuf soname bump
 
diff --git a/paraview_22x22.png b/paraview_22x22.png
deleted file mode 100644
index 4d089d2..0000000
Binary files a/paraview_22x22.png and /dev/null differ
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/paraview.git/commit/?h=f21&id=b4128ff73b07176c7caa3887532d61397aca39d6
