From 1f38d91d1fd7a920da96d54a969f385b964e085f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Jul 18 2014 15:06:58 +0000
Subject: Fixup install


---

diff --git a/cube.spec b/cube.spec
index 3a17686..4f6c5a1 100644
--- a/cube.spec
+++ b/cube.spec
@@ -79,23 +79,15 @@ make
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # Install doc
-cp -p AUTHORS ChangeLog COPYING NEWS README \
+cp -p AUTHORS ChangeLog COPYING README \
       %{buildroot}%{_defaultdocdir}/%{name}/
 
 # Strip rpath
 chrpath -d -k %{buildroot}%{_bindir}/* || :
 
-# Fix jar install location
-mkdir -p %{buildroot}%{_datadir}/java
-mv %{buildroot}%{_libdir}/CubeReader.jar %{buildroot}%{_datadir}/java/CubeReader.jar
-
 # Install desktop file
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications CUBE.desktop
 
-# Move documentatioin to proper location
-mv %{buildroot}%{_datadir}/%{name}/doc/* %{buildroot}%{_defaultdocdir}/%{name}/
-rm -r %{buildroot}%{_datadir}/%{name}
-
 # Not needed since we install into the system dirs
 rm -r %{buildroot}%{_datadir}/modulefiles
 
@@ -126,7 +118,6 @@ fi
 %{_defaultdocdir}/cube/AUTHORS
 %{_defaultdocdir}/cube/ChangeLog
 %{_defaultdocdir}/cube/COPYING
-%{_defaultdocdir}/cube/NEWS
 %{_defaultdocdir}/cube/README
 %{_bindir}/cube
 %{_bindir}/cube3to4
@@ -159,6 +150,7 @@ fi
 %{_libdir}/lib%{name}*.so.4*
 %{_datadir}/applications/CUBE.desktop
 %{_datadir}/icons/Cube.xpm
+%{_datadir}/%{name}/
 
 %files devel
 %{_bindir}/cube-config