- simplified _gamedatadir macro usage, missing dirs, BR: automake

Changed files:
    adonthell.spec -> 1.19

diff --git a/adonthell.spec b/adonthell.spec
index 2beb0d2778f5ad6c55a8077d9993104be30ead60..552b123fea8c882e1f504b6b3cd864c5d158b8a1 100644 (file)
--- a/adonthell.spec
+++ b/adonthell.spec
@@ -4,15 +4,16 @@ Name:         adonthell
 Version:       0.3.3
 Release:       3
 License:       GPL
+Group:         X11/Applications/Games
 Source0:       http://savannah.nongnu.org/download/adonthell/src/%{name}-%{version}.tar.gz
 # Source0-md5: 8ed4a8b02ea24fd393b67bca355cc70b
 Patch0:                %{name}-etc_dir.patch
 URL:           http://adonthell.linuxgames.com/
-Group:         X11/Applications/Games
 BuildRequires: SDL-devel
+BuildRequires: automake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _gamedatadir    share/%{name}
+%define                _gamedatadir    %{_datadir}/%{name}
 
 %description
 Adonthell is a role playing game in development that aims to combine
@@ -40,14 +41,14 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_prefix}/%{_gamedatadir}/{modules,games},%{_bindir},adonthell-wastesedge}
+install -d $RPM_BUILD_ROOT{%{_gamedatadir}/{modules,games},%{_bindir},adonthell-wastesedge}
 
-cp src/modules/adonthell.py $RPM_BUILD_ROOT%{_prefix}/%{_gamedatadir}/modules/adonthell.py
+cp src/modules/adonthell.py $RPM_BUILD_ROOT%{_gamedatadir}/modules/adonthell.py
 
 %{__make} install \
        prefix=$RPM_BUILD_ROOT%{_prefix} \
        bindir=$RPM_BUILD_ROOT%{_bindir} \
-       gamedatadir=$RPM_BUILD_ROOT%{_prefix}/%{_gamedatadir}
+       gamedatadir=$RPM_BUILD_ROOT%{_gamedatadir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWBIE README.* AUTHORS NEWS
-%{_prefix}/%{_gamedatadir}/modules/*
-%{_prefix}/%{_gamedatadir}/games
 %attr(755,root,root) %{_bindir}/adonthell
+%dir %{_gamedatadir}
+%{_gamedatadir}/modules
+%{_gamedatadir}/games