From 9139468bdb51a0e02faca4eafb04d90fa2c5df0b Mon Sep 17 00:00:00 2001
From: Dave Love <d.love@liverpool.ac.uk>
Date: May 05 2016 13:13:02 +0000
Subject: Update to 4.3.4


- Adjust for desktop and module files removed from distribution
- Remove xerces from configure
- Reinstate smp make

---

diff --git a/.gitignore b/.gitignore
index ab71eb6..37949ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /cube-4.3.1.tar.gz
 /cube-4.3.2.tar.gz
 /cube-4.3.3.tar.gz
+/cube-4.3.4.tar.gz
diff --git a/cube.spec b/cube.spec
index 39e5469..95dbab1 100644
--- a/cube.spec
+++ b/cube.spec
@@ -1,6 +1,6 @@
 Name:           cube
-Version:        4.3.3
-Release:        2%{?dist}
+Version:        4.3.4
+Release:        1%{?dist}
 Summary:        CUBE Uniform Behavioral Encoding generic presentation component
 
 License:        BSD
@@ -51,17 +51,14 @@ The %{name}-doc package contains documentation for %{name}.
 
 %prep
 %setup -q
-sed -i -e 's/"//g' CUBE.desktop.in # "
 
 
 %build
 # We need to explicitly set CXX here so that scorep picks it up
 %configure --disable-static \
   --disable-silent-rules \
-  --with-platform=linux \
-  --with-xerces-name=xerces-j2.jar
-make
-# %{?_smp_mflags} - CubeReader.jar fails
+  --with-platform=linux
+make %{?_smp_mflags}
 
 
 %install
@@ -133,11 +130,21 @@ EOF
 chrpath -d -k %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/{,cube-plugins/}*.so  || :
 
 # Install desktop file
+cat <<EOF >CUBE.desktop
+[Desktop Entry]
+Comment=Performance profile browser CUBE
+Encoding=UTF-8
+Exec=/usr/bin/cube
+Icon=/usr/share/icons/Cube.xpm
+InitialPreference=3
+MimeType=application/cube;
+Name=Cube (scalasca.org)
+Terminal=false
+Type=Application
+Categories=Science;ComputerScience;DataVisualization;
+EOF
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications CUBE.desktop
 
-# Not needed since we install into the system dirs
-rm -r %{buildroot}%{_datadir}/modulefiles
-
 
 %check
 make check
@@ -219,6 +226,12 @@ fi
 
 
 %changelog
+* Wed May  4 2016 Dave Love <loveshack@fedoraproject.org> - 4.3.4-1
+- Update to 4.3.4
+- Adjust for desktop and module files removed from distribution
+- Remove xerces from configure
+- Reinstate smp make
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index b515fb3..5e4b16d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 07e109248ed8ffc7bdcce614264a2909  cube-4.3.3.tar.gz
+50f73060f55311cb12c5b3cb354d59fa  cube-4.3.4.tar.gz