- rel2; STBR

- added mp3s with music (-music subpackage)
- fixed %%doc
- fixed datadir
- I hate spending so much time one one spec

Changed files:
    asc.spec -> 1.14

diff --git a/asc.spec b/asc.spec
index b54cab8d99944d85a169a6091035d11bc316873c..bc8c92ba69e1839616b07267c269254296c095bd 100644 (file)
--- a/asc.spec
+++ b/asc.spec
@@ -2,12 +2,14 @@ Summary:      Advanced Strategic Command - a free, turn based strategy game
 Summary(pl):   Advanced Strategic Command - turowa gra strategiczna
 Name:          asc
 Version:       1.10.2
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications/Games/Strategy
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/asc-hq/%{name}-source-%{version}.tar.gz
 Source1:       %{name}.desktop
-Patch0:                %{name}-configure.patch
+Source2:       %{name}-mp3.tar.bz2
+Patch0:                %{name}-ac_fix.patch
+Patch1:                %{name}-am_fix.patch
 URL:           http://www.asc-hq.org/
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
@@ -20,6 +22,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
+%define                _datadir        /usr/share
 
 %description
 ASC is a free, turn based strategy game. It is designed in the
@@ -30,17 +33,32 @@ available for Windows and Linux.
 ASC jest darmow±, turow± gr± strategiczn±. Zosta³a zaprojektowana
 w tradycji serii Battle Isle firmy Bluebyte. Obecnie jest dostêpna
 pod Windows i Linuksa.
-      
+
+%package music
+Summary:               Music for Advanced Strategic Command
+Summary(pl):   Muzyka do Advanced Strategic Command
+Requires:              %{name}
+Group:                 X11/Applications/Games/Strategy
+
+%description music
+Music for Advanced Strategic Command in mp3 format.
+
+%description music -l pl
+Muzyka do Advanced Strategic Command w formacie mp3.
+
 %prep
-%setup -q
-#%patch -p1
+%setup -q -a 2
+%patch0
+%patch1
 
 %build
 %{__libtoolize}
 aclocal
 %{__automake}
 %{__autoconf}
-%configure CPPFLAGS="-I%{_includedir}" LDFLAGS="-L%{_libdir}" --disable-paraguitest
+%configure \
+               CPPFLAGS="-I%{_includedir}" LDFLAGS="-L%{_libdir}" \
+               --disable-paraguitest
 %{__make}
 
 %install
@@ -61,8 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc TODO README AUTHORS ChangeLog doc/readme.* doc/graphics doc/*.html doc/*.css
+%doc TODO README AUTHORS ChangeLog doc/graphics doc/*.html doc/*.css
 %attr(2755,root,games) %{_bindir}/*
-%{_datadir}/games/asc
+%{_datadir}/games/asc/*.zip
+%{_datadir}/games/asc/*.con
 %{_applnkdir}/Games/Strategy/*
 %{_mandir}/man6/*
+
+%files music
+%{_datadir}/games/asc/music