diff --git a/.cvsignore b/.cvsignore index aca2fd8..d38c756 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vodovod-1.10-src.tar.gz +vodovod-1.10r19-src.tar.gz diff --git a/sources b/sources index c431376..2fa481a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc9baa1704b006761bec5e4e64b7ee9d vodovod-1.10-src.tar.gz +5f59ecb5324b52b3c3d6afc8d95521a4 vodovod-1.10r19-src.tar.gz diff --git a/vodovod.spec b/vodovod.spec index 5225256..16a907a 100644 --- a/vodovod.spec +++ b/vodovod.spec @@ -1,53 +1,49 @@ Name: vodovod -Version: 1.10 -Release: 2%{?dist} +Version: 1.10r19 +Release: 1%{?dist} Summary: A pipe connecting game Group: Amusements/Games License: GPLv2+ URL: http://home.gna.org/vodovod/ -Source: http://download.gna.org/vodovod/%{name}-%{version}-src.tar.gz -Patch: vodovod-1.10-gcc43.patch +#Source: http://download.gna.org/vodovod/%{name}-%{version}-src.tar.gz +Source: %{name}-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils SDL-devel SDL_image-devel SDL_mixer-devel -BuildRequires: ImageMagick +BuildRequires: SDL_ttf-devel gettext ImageMagick + +Requires(post): coreutils +Requires(postun): coreutils %description A free cross-platform pipe connecting game. You get a limited number of pipes on each level and need to combine them to lead the water from the house at the top of the screen to the storage tank at the bottom. +%description -l cs_CZ.UTF-8 +Svobodná, multiplatformní logická hra založená na propojování potrubí. +Každá úroveň začíná s omezeným množstvím trubek, které je potřeba umístit +tak, aby svedly vodu z domku na vrchu obrazovky do nádrže dole. + %prep -%setup -q -n %{name}-%{version}-src -%patch -p1 -# change hardcoded paths to datafiles so we can run the game from anywhere -sed -i -e "s:data:%{_datadir}/%{name}/data:" \ - allmenus.cpp game.cpp main.cpp map.cpp sutils.cpp +#%setup -q -n %{name}-%{version}-src +%setup -q -n %{name} %build -make %{?_smp_mflags} CC="%{__cxx} %{optflags}" -# startup wrapper -# we need this because the game uses current directory for config -cat < %{name}-wrapper.sh -#!/bin/sh -pushd "\$PWD" -if [ ! -e ~/.vodovod ]; then - mkdir ~/.vodovod -fi -cd ~/.vodovod -vodovod -popd -EOF +make PREFIX=%{_prefix} HIGHSCOREDIR=%{_localstatedir}/games \ + %{?_smp_mflags} CC="%{__cxx} %{optflags}" # .desktop file cat < %{name}.desktop [Desktop Entry] Name=Vodovod GenericName=Logic Game +GenericName[cs]=Logická hra Comment=A pipe connecting game -Exec=vodovod-wrapper.sh +Comment[cs]=Propojování potrubí +Exec=vodovod Icon=vodovod Terminal=false Type=Application @@ -57,14 +53,17 @@ EOF %install rm -rf %{buildroot} -install -D -m 0755 %{name} %{buildroot}%{_bindir}/%{name} -install -D -m 0755 %{name}-wrapper.sh %{buildroot}%{_bindir}/%{name}-wrapper.sh -mkdir -p -m 0755 %{buildroot}%{_datadir}/%{name} -cp -pr data %{buildroot}%{_datadir}/%{name}/ +make PREFIX=%{_prefix} DESTDIR=%{buildroot} install +# since the game sources do not come with the hiscore file, we have to create it +# this will result in empty hiscore table, but it is not such a big deal +mkdir -p %{buildroot}%{_localstatedir}/games +touch %{buildroot}%{_localstatedir}/games/%{name}.sco +# add icon and .destkop file mkdir -p -m 0755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps convert data/abicon.bmp %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/vodovod.xpm desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications %{name}.desktop +%find_lang %{name} %clean @@ -85,18 +84,29 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc CHANGES COPYING html -%{_bindir}/%{name} -%{_bindir}/%{name}-wrapper.sh +%attr(2755,root,games) %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm - +%config(noreplace) %attr (0664,root,games) %{_localstatedir}/games/%{name}.sco %changelog +* Thu Dec 11 2008 Karel Volny 1.10r19-1 +- Added coreutils to post(un) (fixes bug #475921) +- New version requires SDL_ttf-devel + +* Wed Mar 05 2008 Karel Volny 1.10r13-1 +- development version +- Removed gcc43 patch (fixed upstream) +- Removed wrapper stuff and harcoded paths, upstream now uses variables +- Use hiscore file %%{_localstatedir}/games/%%{name}.sco +- Added language files handling +- Added Czech localisation + * Mon Feb 04 2008 Karel Volny 1.10-2 - Some fixes as per bug #428973: - Fixed summary