Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxpaint for openSUSE:Factory checked in at 2023-05-24 20:23:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxpaint (Old) and /work/SRC/openSUSE:Factory/.tuxpaint.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxpaint" Wed May 24 20:23:18 2023 rev:13 rq:1088893 version:0.9.28 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxpaint/tuxpaint.changes 2022-05-20 17:52:02.199297589 +0200 +++ /work/SRC/openSUSE:Factory/.tuxpaint.new.1533/tuxpaint.changes 2023-05-24 20:23:34.348612439 +0200 @@ -1,0 +2,32 @@ +Wed May 17 07:04:48 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com> + +- List both sdl1 and sdl2 tarballs as sources to please Factory + bots. +- Delete unnecessary hidden thumbnail files. + +------------------------------------------------------------------- +Wed May 3 12:12:04 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com> + +- tuxpaint-pango-cflags.patch: Only apply for openSUSE >= 1550 + where the sdl2 flavoured source is used; prevents build failures + for Leap 15.x. + +------------------------------------------------------------------- +Mon Mar 13 11:34:40 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com> + +- Switch to SDL2 builds for openSUSE >= 1550. +- Add tuxpaint-pango-cflags.patch -- Include cflags from pango's + pkgconfig file to allow finding pango header files. + +------------------------------------------------------------------- +Wed Jan 18 10:59:10 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 0.9.28: + * See release announcement: + <https://tuxpaint.org/latest/tuxpaint-0.9.28-press-release.php> +- Set up conditions to build against SDL2, but keep defaults to + SDL(1) for now. +- Fix some EOL encoding issues. +- Drop unnecessary rpmlintrc filters. + +------------------------------------------------------------------- Old: ---- tuxpaint-0.9.27.tar.gz New: ---- tuxpaint-0.9.28-sdl1.tar.gz tuxpaint-0.9.28-sdl2.tar.gz tuxpaint-pango-cflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxpaint.spec ++++++ --- /var/tmp/diff_new_pack.cR6Hq5/_old 2023-05-24 20:23:35.160617281 +0200 +++ /var/tmp/diff_new_pack.cR6Hq5/_new 2023-05-24 20:23:35.164617304 +0200 @@ -16,25 +16,37 @@ # -%define gnomedir %(gnome-config --prefix) +%if 0%{?suse_version} >= 1550 +%bcond_without sdl2 +%else +%bcond_with sdl2 +%endif + +%define sdlver %{?with_sdl2:2}%{!?with_sdl2:%{nil}} +%define srcver %{?with_sdl2:2}%{!?with_sdl2:1} Name: tuxpaint -Version: 0.9.27 +Version: 0.9.28 Release: 0 Summary: Drawing Program for Young Children License: GPL-2.0-or-later Group: Productivity/Graphics/Bitmap Editors URL: http://www.tuxpaint.org/ -Source: %{name}-%{version}.tar.gz -Source1: tuxpaint-rpmlintrc +Source0: https://download.sourceforge.net/project/tuxpaint/tuxpaint/%{version}/%{name}-%{version}-sdl1.tar.gz +Source1: https://download.sourceforge.net/project/tuxpaint/tuxpaint/%{version}/%{name}-%{version}-sdl2.tar.gz +Source2: tuxpaint-rpmlintrc Patch0: tuxpaint-import-eval.patch # PATCH-FIX-OPENSUSE tuxpaint-makefile.patch -- Disable update-desktop-database, because it do not work Patch1: tuxpaint-makefile.patch +%if 0%{?suse_version} >= 1550 +# PATCH-FIX-UPSTREAM tuxpaint-pango-cflags.patch -- Include cflags from pango's pkgconfig file, needed only for sdl2 flavour +Patch2: tuxpaint-pango-cflags.patch +%endif BuildRequires: ImageMagick -BuildRequires: pkgconfig(sdl) -BuildRequires: pkgconfig(SDL_Pango) -BuildRequires: pkgconfig(SDL_image) -BuildRequires: pkgconfig(SDL_mixer) -BuildRequires: pkgconfig(SDL_ttf) > 2.0.8 +BuildRequires: pkgconfig(sdl%{?sdlver}) +BuildRequires: pkgconfig(SDL%{?sdlver}_Pango) +BuildRequires: pkgconfig(SDL%{?sdlver}_image) +BuildRequires: pkgconfig(SDL%{?sdlver}_mixer) +BuildRequires: pkgconfig(SDL%{?sdlver}_ttf) BuildRequires: pkgconfig(fribidi) BuildRequires: gperf %if 0%{?suse_version} <= 01530 @@ -52,7 +64,7 @@ %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: gettext-devel -BuildRequires: pkgconfig(SDL_gfx) +BuildRequires: pkgconfig(SDL%{?sdlver}_gfx) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: update-desktop-files Requires: freefont @@ -88,11 +100,11 @@ Summary: Devel files of tuxpaint Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: pkgconfig(sdl) -Requires: pkgconfig(SDL_Pango) -Requires: pkgconfig(SDL_image) -Requires: pkgconfig(SDL_mixer) -Requires: pkgconfig(SDL_ttf) +Requires: pkgconfig(sdl%{?sdlver}) +Requires: pkgconfig(SDL%{?sdlver}_Pango) +Requires: pkgconfig(SDL%{?sdlver}_image) +Requires: pkgconfig(SDL%{?sdlver}_mixer) +Requires: pkgconfig(SDL%{?sdlver}_ttf) Requires: pkgconfig(fribidi) Requires: libpaper-devel Requires: libpng-devel @@ -111,15 +123,24 @@ Header files and development documentation for tuxpaint. %prep -%autosetup -p1 +%if %{with sdl2} +%autosetup -p1 -T -b1 -n %{name}-%{version}-sdl%{?srcver} +%else +%autosetup -p1 -n %{name}-%{version}-sdl%{?srcver} +%endif find . -name CVS -exec rm -rf {} + find docs/ -type f -exec chmod -v 644 {} + -make PREFIX=%{_prefix} MAGIC_PREFIX=%{_libdir}/%{name}/plugins tp-magic-config +sed -Ei "s/\r$//" docs/outdated/*/*.txt %build %make_build \ PREFIX=%{_prefix} \ + MAGIC_PREFIX=%{_libdir}/%{name}/plugins \ + CFLAGS="%{optflags}" \ + tp-magic-config +%make_build \ + PREFIX=%{_prefix} \ CFLAGS="%{optflags}" \ MAGIC_PREFIX=%{_libdir}/%{name}/plugins @@ -138,8 +159,10 @@ GNOME_PREFIX="%{_prefix}" \ KDE_ICON_PREFIX="%{_datadir}/icons" -find %{buildroot}/%{_mandir} -type f -exec chmod 644 {} + +find %{buildroot}%{_mandir} -type f -exec chmod 644 {} + find %{buildroot} -type d -exec chmod 0755 {} + +# Delete hidden thumbnail files +find %{buildroot}%{_datadir}/%{name} -name ".thumbs" -print -exec rm -fr {} + %if 0%{?suse_version} find %{buildroot} -name "*.desktop" -print -delete ++++++ tuxpaint-makefile.patch ++++++ --- /var/tmp/diff_new_pack.cR6Hq5/_old 2023-05-24 20:23:35.204617543 +0200 +++ /var/tmp/diff_new_pack.cR6Hq5/_new 2023-05-24 20:23:35.204617543 +0200 @@ -1,8 +1,8 @@ -Index: tuxpaint-0.9.27/Makefile +Index: tuxpaint-0.9.28-sdl2/Makefile =================================================================== ---- tuxpaint-0.9.27.orig/Makefile -+++ tuxpaint-0.9.27/Makefile -@@ -74,6 +74,7 @@ endif +--- tuxpaint-0.9.28-sdl2.orig/Makefile ++++ tuxpaint-0.9.28-sdl2/Makefile +@@ -75,6 +75,7 @@ endif # <HOSTROOT>/lib Library files. # <HOSTROOT>/lib/pkgconfig *.pc files. # @@ -10,7 +10,7 @@ ifdef HOST ifdef HOSTROOT ifeq ($(wildcard $(HOSTROOT)/.),) -@@ -721,9 +722,9 @@ uninstall: uninstall-i18n +@@ -747,9 +748,9 @@ uninstall: uninstall-i18n @if [ "x$(shell which xdg-desktop-menu)" != "x" ]; then \ xdg-desktop-menu uninstall tux4kids-tuxpaint.desktop ; \ fi @@ -23,7 +23,7 @@ # Install default config file: .PHONY: install-default-config -@@ -905,7 +906,7 @@ install-nokia770: +@@ -931,7 +932,7 @@ install-nokia770: .PHONY: install-xdg install-xdg: @echo @@ -32,7 +32,7 @@ @if [ "x$(shell which xdg-icon-resource install)" != "x" ]; then \ xdg-icon-resource install --size 192 data/images/icon192x192.png tux4kids-tuxpaint ; \ xdg-icon-resource install --size 128 data/images/icon128x128.png tux4kids-tuxpaint ; \ -@@ -921,9 +922,9 @@ install-xdg: +@@ -947,9 +948,9 @@ install-xdg: xdg-desktop-menu install tux4kids-tuxpaint.desktop ; \ rm ./tux4kids-tuxpaint.desktop ; \ fi ++++++ tuxpaint-pango-cflags.patch ++++++ Index: tuxpaint-0.9.28-sdl2/Makefile =================================================================== --- tuxpaint-0.9.28-sdl2.orig/Makefile +++ tuxpaint-0.9.28-sdl2/Makefile @@ -112,6 +112,8 @@ endif # change to sdl-console to build a console version on Windows SDL_PCNAME:=sdl2 +PANGO_PCNAME:=pango + WINDRES:=windres PKG_CONFIG:=pkg-config ifdef PKG_CONFIG_LIBDIR @@ -298,6 +300,7 @@ SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL2_PANGO_ SDL_CFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags) +PANGO_CFLAGS:=$(shell $(PKG_CONFIG) $(PANGO_PCNAME) --cflags) # New one: -lrsvg-2 -lcairo # Old one: -lcairo -lsvg -lsvg-cairo @@ -1214,14 +1217,14 @@ obj/fonts.o: src/fonts.c src/fonts.h src src/get_fname.h src/debug.h @echo @echo "...Compiling font support..." - @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \ + @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \ -c src/fonts.c -o obj/fonts.o obj/dirwalk.o: src/dirwalk.c src/dirwalk.h src/progressbar.h src/fonts.h \ src/debug.h @echo @echo "...Compiling directory-walking support..." - @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \ + @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \ -c src/dirwalk.c -o obj/dirwalk.o obj/cursor.o: src/cursor.c src/cursor.h src/debug.h ++++++ tuxpaint-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.cR6Hq5/_old 2023-05-24 20:23:35.240617758 +0200 +++ /var/tmp/diff_new_pack.cR6Hq5/_new 2023-05-24 20:23:35.248617806 +0200 @@ -1,5 +1,3 @@ -addFilter("unstripped-binary-or-object.*/usr/lib.*/tuxpaint/plugins/.*") -addFilter("invalid-lc-messages-dir.*/usr/share/locale/.*/LC_MESSAGES/tuxpaint.mo") # key definition table, no include file addFilter("devel-file-in-non-devel-package.*/usr/share/tuxpaint/osk/keysymdef.h");
