From 747e69f7c710927bb7f6e8ee8807f57956d7c9f0 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Wed, 29 Jun 2022 09:45:24 +0900 Subject: [PATCH 1/2] tuxpaint.spec: adapted to the change of naming rule of tar ball --- tuxpaint.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tuxpaint.spec b/tuxpaint.spec index 62969802f..25f5c2edd 100644 --- a/tuxpaint.spec +++ b/tuxpaint.spec @@ -5,7 +5,7 @@ Release: 1 License: GPL Group: Multimedia/Graphics URL: http://www.tuxpaint.org/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}-sdl1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: SDL >= 1.2.4 SDL_image SDL_mixer SDL_ttf SDL_Pango SDL_gfx libpaper fribidi xdg-utils libimagequant BuildRequires: SDL-devel >= 1.2.4 SDL_image-devel SDL_mixer-devel SDL_ttf-devel SDL_Pango-devel SDL_gfx-devel @@ -33,7 +33,7 @@ Requires: librsvg2-devel libpaper-devel fribidi-devel gperf development files for tuxpaint plugins. %prep -%setup -q +%setup -q -n %{name}-%{version}-sdl1 %build make PREFIX=%{_prefix} DOC_PREFIX=%{_docdir}/tuxpaint/en linux_ARCH_CFLAGS=-I/usr/include/imagequant @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/tp-magic-config.* %changelog +* Wed Jun 29 2022 - +- Adapted to the change of naming rule of tar ball + * Wed Jun 29 2022 - - Set minimum version requirement for gettext From f0eaaaf376aea14c4c9f948f45acb472a636e2d5 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Tue, 28 Jun 2022 19:22:34 -0700 Subject: [PATCH 2/2] Sync INSTALL docs for sdl2 change --- docs/en/INSTALL.txt | 2 +- docs/en/html/INSTALL.html | 2 +- docs/es_ES.UTF-8/INSTALL.txt | 2 +- docs/es_ES.UTF-8/html/INSTALL.html | 2 +- docs/fr_FR.UTF-8/INSTALL.txt | 2 +- docs/fr_FR.UTF-8/html/INSTALL.html | 2 +- docs/gl_ES.UTF-8/INSTALL.txt | 2 +- docs/gl_ES.UTF-8/html/INSTALL.html | 2 +- docs/ja_JP.UTF-8/INSTALL.txt | 2 +- docs/ja_JP.UTF-8/html/INSTALL.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/en/INSTALL.txt b/docs/en/INSTALL.txt index 411d1fd8e..3d2e079b1 100644 --- a/docs/en/INSTALL.txt +++ b/docs/en/INSTALL.txt @@ -618,7 +618,7 @@ macOS * libpaper * libpng * librsvg - * libsdl + * libsdl2 * libsdl2_image * libsdl2_mixer * libsdl2_pango^* diff --git a/docs/en/html/INSTALL.html b/docs/en/html/INSTALL.html index e1bc6c729..f3347e43c 100644 --- a/docs/en/html/INSTALL.html +++ b/docs/en/html/INSTALL.html @@ -957,7 +957,7 @@
  • libpaper
  • libpng
  • librsvg
    • -
  • libsdl
    • +
  • libsdl2
  • libsdl2_image
  • libsdl2_mixer
  • libsdl2_pango*
    • diff --git a/docs/es_ES.UTF-8/INSTALL.txt b/docs/es_ES.UTF-8/INSTALL.txt index d8d68f95e..1d607762d 100644 --- a/docs/es_ES.UTF-8/INSTALL.txt +++ b/docs/es_ES.UTF-8/INSTALL.txt @@ -618,7 +618,7 @@ macOS * libpaper * libpng * librsvg - * libsdl + * libsdl2 * libsdl2_image * libsdl2_mixer * libsdl2_pango^* diff --git a/docs/es_ES.UTF-8/html/INSTALL.html b/docs/es_ES.UTF-8/html/INSTALL.html index 7536df3fb..819d3dbff 100644 --- a/docs/es_ES.UTF-8/html/INSTALL.html +++ b/docs/es_ES.UTF-8/html/INSTALL.html @@ -957,7 +957,7 @@
  • libpaper
  • libpng
  • librsvg
    • -
  • libsdl
    • +
  • libsdl2
  • libsdl2_image
  • libsdl2_mixer
  • libsdl2_pango*
    • diff --git a/docs/fr_FR.UTF-8/INSTALL.txt b/docs/fr_FR.UTF-8/INSTALL.txt index f15d5b110..b6712bbf2 100644 --- a/docs/fr_FR.UTF-8/INSTALL.txt +++ b/docs/fr_FR.UTF-8/INSTALL.txt @@ -638,7 +638,7 @@ macOS * libpaper * libpng * librsvg - * libsdl + * libsdl2 * libsdl2_image * libsdl2_mixer * libsdl2_pango^* diff --git a/docs/fr_FR.UTF-8/html/INSTALL.html b/docs/fr_FR.UTF-8/html/INSTALL.html index b8573e41e..e743195a8 100644 --- a/docs/fr_FR.UTF-8/html/INSTALL.html +++ b/docs/fr_FR.UTF-8/html/INSTALL.html @@ -957,7 +957,7 @@
  • libpaper
  • libpng
  • librsvg
    • -
  • libsdl
    • +
  • libsdl2
  • libsdl2_image
  • libsdl2_mixer
  • libsdl2_pango*
    • diff --git a/docs/gl_ES.UTF-8/INSTALL.txt b/docs/gl_ES.UTF-8/INSTALL.txt index 5099bbea4..0f0aff19c 100644 --- a/docs/gl_ES.UTF-8/INSTALL.txt +++ b/docs/gl_ES.UTF-8/INSTALL.txt @@ -627,7 +627,7 @@ macOS * libpaper * libpng * librsvg - * libsdl + * libsdl2 * libsdl2_image * libsdl2_mixer * libsdl2_pango^* diff --git a/docs/gl_ES.UTF-8/html/INSTALL.html b/docs/gl_ES.UTF-8/html/INSTALL.html index 80f7416ae..ae6898892 100644 --- a/docs/gl_ES.UTF-8/html/INSTALL.html +++ b/docs/gl_ES.UTF-8/html/INSTALL.html @@ -957,7 +957,7 @@
  • libpaper
  • libpng
  • librsvg
    • -
  • libsdl
    • +
  • libsdl2
  • libsdl2_image
  • libsdl2_mixer
  • libsdl2_pango*
    • diff --git a/docs/ja_JP.UTF-8/INSTALL.txt b/docs/ja_JP.UTF-8/INSTALL.txt index 3203c709c..53d26cb3b 100644 --- a/docs/ja_JP.UTF-8/INSTALL.txt +++ b/docs/ja_JP.UTF-8/INSTALL.txt @@ -618,7 +618,7 @@ macOS * libpaper * libpng * librsvg - * libsdl + * libsdl2 * libsdl2_image * libsdl2_mixer * libsdl2_pango^* diff --git a/docs/ja_JP.UTF-8/html/INSTALL.html b/docs/ja_JP.UTF-8/html/INSTALL.html index 5116516a8..391ef338d 100644 --- a/docs/ja_JP.UTF-8/html/INSTALL.html +++ b/docs/ja_JP.UTF-8/html/INSTALL.html @@ -957,7 +957,7 @@
  • libpaper
  • libpng
  • librsvg
    • -
  • libsdl
    • +
  • libsdl2
  • libsdl2_image
  • libsdl2_mixer
  • libsdl2_pango*