- up to 2.2.0.0

- remove macro which checks curl dep (-configure.patch)
- BR: curl-devel, zlib-devel
- autotools work again
- add tools package

Changed files:
    asc.spec -> 1.37

diff --git a/asc.spec b/asc.spec
index 1390a9518e71a49001194cbda8e1616c1555195f..25689d16cef307a6354287f2cbc3da193e687626 100644 (file)
--- a/asc.spec
+++ b/asc.spec
@@ -1,35 +1,37 @@
 # TODO:
 # - check sounds - doesn't work for me
-# - check unpacked files
 
 Summary:       Advanced Strategic Command - a free, turn based strategy game
 Summary(pl.UTF-8):     Advanced Strategic Command - turowa gra strategiczna
 Name:          asc
-Version:       2.1.0.0
-Release:       0.1
+Version:       2.2.0.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://dl.sourceforge.net/asc-hq/%{name}-%{version}.tar.bz2
-# Source0-md5: d76cf500bebdddd8e7d2a094b532e6af
+# Source0-md5: a5207e63109bb81b432542d0b43e9970
 Source1:       %{name}.desktop
 Source2:       %{name}.xpm
+Patch0:                %{name}-configure.patch
 URL:           http://www.asc-hq.org/
+BuildRequires: SDL-devel >= 1.2.2
 BuildRequires: SDL_image-devel
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: SDL_sound-devel
-BuildRequires: SDL-devel >= 1.2.2
-#BuildRequires:        autoconf
-#BuildRequires:        automake
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: boost-devel >= 1.35.0
 BuildRequires: bzip2-devel >= 1.0.0
+BuildRequires: curl-devel >= 7.10.0
 BuildRequires: expat-devel
 BuildRequires: freetype-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libsigc++12-devel >= 1.2
-#BuildRequires:        libtool >= 2:1.5
+BuildRequires: libtool >= 2:1.5
 BuildRequires: physfs-devel
 BuildRequires: pkgconfig
+BuildRequires: zlib-devel
 Obsoletes:     asc-music
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,21 +41,31 @@ It can be played against the computer or against other human players
 (either hotseat or by mail).
 
 %description -l pl.UTF-8
-ASC jest turową grą strategiczną mającą korzenie w Battle Isle 2/3.
-Grając w nią można się zmierzyć z komputerem lub z innym człowiekiem
-(przy jednym komputerze, lub przez pocztę).
+ASC jest turową grą strategiczną mającą korzenie w Battle Isle
+2/3. Grając w nią można się zmierzyć z komputerem lub z innym
+człowiekiem (przy jednym komputerze, lub przez pocztę).
+
+%package tools
+Summary:       Tools for ASC
+Summary(pl.UTF-8):     Narzedzia dla ASC
+Group:         X11/Applications/Games/Strategy
+
+%description tools
+Map editor and other tools for ASC.
+
+%description tools -l pl.UTF-8
+Edytor map i inne narzedzia dla ASC
 
 %prep
 %setup -q
+%patch0 -p1
 
-# some problems with autotools in this version,
-# probably different versions of one of the build tools
 %build
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__autoconf}
-#%%{__autoheader}
-#%%{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -72,11 +84,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog source/TODO 
+%doc ChangeLog source/TODO
 %attr(2755,root,games) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/asc_mapedit
 %{_datadir}/games/%{name}
 %{_desktopdir}/%{name}.desktop
 %{_mandir}/man6/%{name}.6*
-%{_mandir}/man6/asc_mapedit.6*
 %{_pixmapsdir}/%{name}.xpm
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/asc_demount
+%attr(755,root,root) %{_bindir}/asc_mapedit
+%attr(755,root,root) %{_bindir}/asc_mount
+%attr(755,root,root) %{_bindir}/asc_weaponguide
+%{_mandir}/man6/asc_demount.6*
+%{_mandir}/man6/asc_mapedit.6*
+%{_mandir}/man6/asc_mount.6*
+%{_mandir}/man6/asc_weaponguide.6*