diff --git a/vodovod.spec b/vodovod.spec index fbf72e0..42e2cce 100644 --- a/vodovod.spec +++ b/vodovod.spec @@ -1,10 +1,10 @@ Name: vodovod Version: 1.10r22 -Release: 11%{?dist} +Release: 30%{?dist} Summary: A pipe connecting game -Group: Amusements/Games -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://home.gna.org/vodovod/ #Source: http://download.gna.org/vodovod/%%{name}-%%{version}-src.tar.gz # svn export -r 22 svn://svn.gna.org/svn/vodovod/trunk vodovod @@ -13,10 +13,16 @@ Source: %{name}-%{version}-src.tar.gz Patch0: vodovod-1.10r22-locales.patch Patch1: vodovod-1.10r22-format-string.patch +BuildRequires: make +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils SDL-devel SDL_image-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel gettext ImageMagick -Requires: dejavu-sans-mono-fonts +# Automate finding font file paths +%global fonts font(dejavusansmono) +Requires: %{fonts} +BuildRequires: fontconfig %{fonts} + Requires(post): coreutils Requires(postun): coreutils @@ -40,14 +46,9 @@ aby viedli vodu z domčeka v hornej časti obrazovky do nádrže v dolnej časti #%%setup -q -n %%{name}-%%{version}-src %setup -q -n %{name} # update locales -%patch0 -p1 +%patch -P0 -p1 # fix bug #1037377 -%patch1 -p1 -# replace the bundled font usage with the one provided by font package -rm data/font1.ttf -sed -i -e "s|data/font1.ttf|../fonts/dejavu/DejaVuSansMono.ttf|" \ - allmenus.cpp main.cpp game.cpp - +%patch -P1 -p1 %build make PREFIX=%{_prefix} HIGHSCOREDIR=%{_localstatedir}/games \ @@ -72,6 +73,9 @@ EOF %install make PREFIX=%{_prefix} DESTDIR=%{buildroot} install +# replace the bundled font usage with the one provided by font package +ln -f -s $(fc-match -f "%{file}" "dejavusansmono") \ + %{buildroot}%{_datadir}/%{name}/data/font1.ttf # 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 @@ -83,21 +87,6 @@ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications %{name}.desktop %find_lang %{name} - -%post -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - -%postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - %files -f %{name}.lang %doc CHANGES COPYING html %attr(2755,root,games) %{_bindir}/%{name} @@ -108,6 +97,63 @@ fi %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.10r22-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.10r22-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.10r22-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.10r22-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 1.10r22-26 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.10r22-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.10r22-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.10r22-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.10r22-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.10r22-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.10r22-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.10r22-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.10r22-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.10r22-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 14 2020 Bruno Wolff III - 1.10r22-16 +- Automate font path finding during build + +* Fri Jan 31 2020 Fedora Release Engineering - 1.10r22-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.10r22-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.10r22-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.10r22-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.10r22-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild