--- cauldron/zhu3d/current/SPECS/zhu3d.spec	2013/06/29 06:11:19	448221
+++ cauldron/zhu3d/current/SPECS/zhu3d.spec	2013/06/29 08:57:52	448222
@@ -1,23 +1,23 @@
 Summary:	OpenGL-based equation viewer and solver
 Name:		zhu3d
 Version:	4.2.6
-Release:	%mkrel 1
+Release:	%mkrel 2
 License:	GPLv2+
 Group:		Sciences/Mathematics
 Url:		http://kde-apps.org/content/show.php?content=43071
 Source0:	http://download.sourceforge.net/zhu3d/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 Patch0:		%{name}-4.2.6-path.patch
-BuildRequires:	qt4-devel	>= 4.0
+BuildRequires:	qt4-devel >= 4.0
 BuildRequires:	libmesaglu-devel
 
 %description
 With Zhu3D you interactively can view and animate functions,
-isosurfaces and a further independent parametric system. 
-Numerical solutions of equation systems can be found with 
-a precise and reliable adaptive random search. The 
+isosurfaces and a further independent parametric system.
+Numerical solutions of equation systems can be found with
+a precise and reliable adaptive random search. The
 OpenGL-viewer supports zooming, scaling, rotating and
-translating as well as filed lightning or surface properties. 
+translating as well as filed lightning or surface properties.
 Special effects are transparency, textures, fog and motion blur.
 
 %prep
@@ -31,44 +31,36 @@
 %make
 
 %install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-mkdir -p %{buildroot}%{_datadir}/apps/%{name}/{work/textures,system/languages}
+mkdir -p %{buildroot}%{_datadir}/%{name}/{work/textures,system/languages}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
 
 install -D %{name} %{buildroot}%{_bindir}/%{name}
 install -D %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
-install work/*.zhu %{buildroot}%{_datadir}/apps/%{name}/work
-install work/textures/* %{buildroot}%{_datadir}/apps/%{name}/work/textures
-install system/*.zhu %{buildroot}%{_datadir}/apps/%{name}/system
-install system/languages/*.qm %{buildroot}%{_datadir}/apps/%{name}/system/languages
-install system/icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install work/*.zhu %{buildroot}%{_datadir}/%{name}/work
+install work/textures/* %{buildroot}%{_datadir}/%{name}/work/textures
+install system/*.zhu %{buildroot}%{_datadir}/%{name}/system
+install system/languages/*.qm %{buildroot}%{_datadir}/%{name}/system/languages
+install system/icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/%{name}.png
 
 #useless file
-rm -f %{buildroot}%{_datadir}/apps/%{name}/work/.directory
-
-%clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -f %{buildroot}%{_datadir}/%{name}/work/.directory
 
 %files
-%defattr(644,root,root,755)
 %doc doc/ readme.txt
-%attr(755,root,root) %{_bindir}/%{name}
-%dir %{_datadir}/apps/%{name}
-%dir %{_datadir}/apps/%{name}/work
-%dir %{_datadir}/apps/%{name}/work/textures
-%dir %{_datadir}/apps/%{name}/system
-%dir %{_datadir}/apps/%{name}/system/languages
-%{_datadir}/apps/%{name}/work/*.zhu
-%{_datadir}/apps/%{name}/work/textures/*.jpg
-%{_datadir}/apps/%{name}/work/textures/*.txt
-%{_datadir}/apps/%{name}/system/*.zhu
-%{_iconsdir}/hicolor/64x64/apps/*.png
+%{_bindir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/work
+%dir %{_datadir}/%{name}/work/textures
+%dir %{_datadir}/%{name}/system
+%dir %{_datadir}/%{name}/system/languages
+%{_datadir}/%{name}/work/*.zhu
+%{_datadir}/%{name}/work/textures/*.jpg
+%{_datadir}/%{name}/work/textures/*.txt
+%{_datadir}/%{name}/system/*.zhu
+%{_iconsdir}/hicolor/64x64/*.png
 %{_datadir}/applications/%{name}.desktop
-%lang(cs) %{_datadir}/apps/%{name}/system/languages/%{name}_cs.qm
-%lang(de) %{_datadir}/apps/%{name}/system/languages/%{name}_de.qm
-%lang(es) %{_datadir}/apps/%{name}/system/languages/%{name}_es.qm
-%lang(fr) %{_datadir}/apps/%{name}/system/languages/%{name}_fr.qm
-%lang(zh) %{_datadir}/apps/%{name}/system/languages/%{name}_zh.qm
-
-
+%lang(cs) %{_datadir}/%{name}/system/languages/%{name}_cs.qm
+%lang(de) %{_datadir}/%{name}/system/languages/%{name}_de.qm
+%lang(es) %{_datadir}/%{name}/system/languages/%{name}_es.qm
+%lang(fr) %{_datadir}/%{name}/system/languages/%{name}_fr.qm
+%lang(zh) %{_datadir}/%{name}/system/languages/%{name}_zh.qm