- aaargh! PLDified, cleanups, simplifications

- don't know if it builds, i've tested 1.60, but i guess it'll be ok

Changed files:
    BillardGL.spec -> 1.2

diff --git a/BillardGL.spec b/BillardGL.spec
index 66e97904b1046e16b03fc69137f79a34cad9f3a6..2c0db3f799c4f0fee997966419b83b3f7824b87c 100644 (file)
--- a/BillardGL.spec
+++ b/BillardGL.spec
@@ -1,77 +1,54 @@
 Name:          BillardGL
-Summary:       3d billard simulation using OpenGL
+Summary:       3D billard simulation using OpenGL
 Summary(pl):   Symulacja bilarda u¿ywaj±ca OpenGL
 Version:       1.70
-Release:       0.1
+Release:       0.2
 Group:         X11/Applications/Games
 License:       GPL
 URL:           http://www.billardgl.de
 Vendor:                University of Freiburg / Germany
 Source0:       http://wesley.informatik.uni-freiburg.de/~nopper/BillardGL/download/%{name}-%{version}.tar.gz
-BuildRoot:     %{tmpdir}/%{name}-%{version}-build-root-%(id -u -n)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        _x11bindir      %{_prefix}/X11R6/bin
-%define                _x11share       %{_prefix}/X11R6/share
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
 
 %description
-3d billard simulation using OpenGL
-
-Stefan Disch, Tobias Nopper, Martina Welte
-
-University of Freiburg / Germany Department of computer-sience
+3D billard simulation using OpenGL.
 
 %description -l pl
 Trójwymiarowa symulacja bilarda u¿ywaj±ca OpenGL.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 cd src
-sed -e "s:/usr/share/:/usr/X11R6/share/:" Namen.h > Namen
+sed -e "s:/usr/share/:%{_datadir}/:" Namen.h > Namen
 mv -f Namen Namen.h
 %{__make}
 
-gzip -9nf README
-
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/Texturen/{1,2,4,8}}
 
-install -d $RPM_BUILD_ROOT{%{_x11bindir},%{_x11share},%{_x11share}/BillardGL,%{_prefix}/share/doc/%{name}-%{version}}
-install -d $RPM_BUILD_ROOT%{_x11share}/%{name}/Texturen/{1,2,4,8}
 cd src
-install BillardGL $RPM_BUILD_ROOT%{_x11bindir}
-install *.gz $RPM_BUILD_ROOT%{_prefix}/share/doc/%{name}-%{version}
-install *.lang $RPM_BUILD_ROOT%{_x11share}/%{name}
-
-for i in Texturen/1/*; do
-    install $i $RPM_BUILD_ROOT%{_x11share}/%{name}/Texturen/1
-done
-
-for i in Texturen/2/*; do
-    install $i $RPM_BUILD_ROOT%{_x11share}/%{name}/Texturen/2
-done
+install BillardGL $RPM_BUILD_ROOT%{_bindir}
+install *.lang $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-for i in Texturen/4/*; do
-    install $i $RPM_BUILD_ROOT%{_x11share}/%{name}/Texturen/4
-done
+gzip -9nf README
 
-for i in Texturen/8/*; do
-    install $i $RPM_BUILD_ROOT%{_x11share}/%{name}/Texturen/8
+for j in 1 2 4 8 ; do
+       for i in Texturen/$j/*; do
+               install $i $RPM_BUILD_ROOT%{_datadir}/%{name}/Texturen/$j
+       done
 done
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#%doc src/*.gz
-%attr(755,root,root) %{_x11bindir}/BillardGL
-%dir %{_x11share}/%{name}/*
-%{_x11share}/%{name}/Texturen/1/*
-%{_x11share}/%{name}/Texturen/2/*
-%{_x11share}/%{name}/Texturen/4/*
-%{_x11share}/%{name}/Texturen/8/*
-%{_prefix}/share/doc/*
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%doc src/*.gz
+%attr(755,root,root) %{_bindir}/BillardGL
+%{_datadir}/%{name}