- killed _x11bindir

Changed files:
    0verkill.spec -> 1.29

diff --git a/0verkill.spec b/0verkill.spec
index d8abba5d7491b802f8a5e6484305a48ba8c362f5..7f3dd261dad5c89acba6e042e7e1ca89498ef2d8 100644 (file)
--- a/0verkill.spec
+++ b/0verkill.spec
@@ -15,8 +15,6 @@ BuildRequires:        autoconf
 BuildRequires: automake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _x11bindir      /usr/X11R6/bin
-
 %description
 0verkill is an ASCII-art multiplayer shooting game.
 
@@ -27,7 +25,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Summary:       X version of 0verkill
 Summary(pl):   Wersja 0verkill pod X
 Group:         X11/Applications/Games
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description x11
 This package allows you to run an 0verkill client in an X window.
@@ -45,14 +43,15 @@ Ten pakiet pozwala na uruchomienie klienta 0verkill w oknie X.
 %{__autoconf}
 %configure
 %{__make}
-%{__make} x0verkill XLIBS="-L/usr/X11R6/%{_lib} -lX11"
+%{__make} x0verkill \
+       XLIBS="-L/usr/X11R6/%{_lib} -lX11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/{grx,data},%{_x11bindir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/{grx,data}}
 
 install 0verkill avi $RPM_BUILD_ROOT%{_bindir}
-install x0verkill $RPM_BUILD_ROOT%{_x11bindir}
+install x0verkill $RPM_BUILD_ROOT%{_bindir}
 install server $RPM_BUILD_ROOT%{_bindir}/0verkill-server
 install test_server $RPM_BUILD_ROOT%{_bindir}/0verkill-test_server
 install bot $RPM_BUILD_ROOT%{_bindir}/0verkill-bot
@@ -68,9 +67,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc doc/AUTHORS doc/CHANGELOG doc/*.{txt,html}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/0verkill
+%attr(755,root,root) %{_bindir}/0verkill-bot
+%attr(755,root,root) %{_bindir}/0verkill-server
+%attr(755,root,root) %{_bindir}/0verkill-test_server
+%attr(755,root,root) %{_bindir}/avi
 %{_datadir}/%{name}
 
 %files x11
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_x11bindir}/*
+%attr(755,root,root) %{_x11bindir}/x0verkill