Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxpaint for openSUSE:Factory checked in at 2022-01-07 12:46:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxpaint (Old) and /work/SRC/openSUSE:Factory/.tuxpaint.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxpaint" Fri Jan 7 12:46:02 2022 rev:10 rq:944527 version:0.9.26 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxpaint/tuxpaint.changes 2019-10-04 16:07:12.840631056 +0200 +++ /work/SRC/openSUSE:Factory/.tuxpaint.new.1896/tuxpaint.changes 2022-01-07 12:47:31.887893379 +0100 @@ -1,0 +2,12 @@ +Sat Oct 2 12:12:25 UTC 2021 - Carsten Ziepke <[email protected]> + +- update to 0.9.26: + - please refer to /usr/share/doc/packages/tuxpaint/CHANGES.txt + for a detailed list and contributors +- Run spec-cleaner +- dropped kdelibs4-removal.patch +- Rebase tuxpaint-import-eval.patch +- Add BuildRequires ImageMagick, libimagequant-devel, xdg-utils +- Add tuxpaint-makefile.patch for disable update-desktop-database + +------------------------------------------------------------------- Old: ---- kdelibs4-removal.patch tuxpaint-0.9.23.tar.gz New: ---- tuxpaint-0.9.26.tar.gz tuxpaint-makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxpaint.spec ++++++ --- /var/tmp/diff_new_pack.Jzc9X8/_old 2022-01-07 12:47:32.627893893 +0100 +++ /var/tmp/diff_new_pack.Jzc9X8/_new 2022-01-07 12:47:32.631893896 +0100 @@ -1,7 +1,7 @@ # # spec file for package tuxpaint # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,18 @@ %define gnomedir %(gnome-config --prefix) Name: tuxpaint -Version: 0.9.23 +Version: 0.9.26 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: http://sourceforge.net/projects/tuxpaint/files/tuxpaint/%{version}/%{name}-%{version}.tar.gz +Source: https://sourceforge.net/projects/tuxpaint/files/tuxpaint/%{version}/%{name}-%{version}.tar.gz Source1: tuxpaint-rpmlintrc -# PATCH-FIX-OPENSUSE 0001-Prepare-the-kdelibs4-removal.patch -Patch0: kdelibs4-removal.patch -Patch1: tuxpaint-import-eval.patch +Patch0: tuxpaint-import-eval.patch +# PATCH-FIX-OPENSUSE tuxpaint-makefile.patch -- Disable update-desktop-database, because it do not work +Patch1: tuxpaint-makefile.patch +BuildRequires: ImageMagick BuildRequires: SDL-devel BuildRequires: SDL_Pango-devel BuildRequires: SDL_image-devel @@ -36,8 +37,10 @@ BuildRequires: SDL_ttf-devel > 2.0.8 BuildRequires: fribidi-devel BuildRequires: gperf +BuildRequires: libimagequant-devel BuildRequires: libpaper-devel BuildRequires: libpng-devel +BuildRequires: xdg-utils BuildRequires: zlib-devel # # openSUSE @@ -105,23 +108,24 @@ %prep %setup -q %patch0 -p1 -%patch1 -b .import-eval-patch +%patch1 -p1 + find . -name CVS -print0 | xargs -0 rm -rf find docs/ -type f -print0 | xargs -0 chmod -v 644 make PREFIX=%{_prefix} MAGIC_PREFIX=%{_libdir}/%{name}/plugins tp-magic-config %build -make %{?_smp_mflags} \ +%make_build \ PREFIX=%{_prefix} \ CFLAGS="%{optflags}" \ - MAGIC_PREFIX=%{_libdir}/%{name}/plugins -lpng14 + MAGIC_PREFIX=%{_libdir}/%{name}/plugins %install %if ! 0%{?suse_version} mkdir -p %{buildroot} %endif -make install install-kde-icons \ +make install \ PREFIX="%{_prefix}" \ X11_ICON_PREFIX="%{buildroot}/%{_datadir}/pixmaps" \ MAGIC_PREFIX="%{buildroot}/%{_libdir}/%{name}/plugins" \ @@ -148,8 +152,10 @@ %{buildroot}/%{_datadir}/applications/tuxpaint.desktop rm -rf %{buildroot}/%{_docdir}/%{name} %endif + # remove unneeded scripts rm %{buildroot}/%{_datadir}/%{name}/fonts/locale/zh_tw_docs/*.{sh,py,pe} + # find lang %find_lang %{name} @@ -170,30 +176,6 @@ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.* %{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor -%if 0%{?suse_version} <= 1130 -# locales not in official openSUSE distribution -%dir %{_datadir}/locale/en_ZA -%dir %{_datadir}/locale/en_ZA/LC_MESSAGES -%dir %{_datadir}/locale/gos -%dir %{_datadir}/locale/gos/LC_MESSAGES -%dir %{_datadir}/locale/nr -%dir %{_datadir}/locale/nr/LC_MESSAGES -%dir %{_datadir}/locale/oj -%dir %{_datadir}/locale/oj/LC_MESSAGES -%dir %{_datadir}/locale/tlh -%dir %{_datadir}/locale/tlh/LC_MESSAGES -%if ! %{defined fedora} -%dir %{_datadir}/locale/twi -%dir %{_datadir}/locale/twi/LC_MESSAGES -%endif -%dir %{_datadir}/locale/shs -%dir %{_datadir}/locale/shs/LC_MESSAGES -%dir %{_datadir}/locale/son -%dir %{_datadir}/locale/son/LC_MESSAGES -%dir %{_datadir}/locale/zam -%dir %{_datadir}/locale/zam/LC_MESSAGES -%endif %files devel %if 0%{?suse_version} ++++++ tuxpaint-0.9.23.tar.gz -> tuxpaint-0.9.26.tar.gz ++++++ /work/SRC/openSUSE:Factory/tuxpaint/tuxpaint-0.9.23.tar.gz /work/SRC/openSUSE:Factory/.tuxpaint.new.1896/tuxpaint-0.9.26.tar.gz differ: char 5, line 1 ++++++ tuxpaint-import-eval.patch ++++++ --- /var/tmp/diff_new_pack.Jzc9X8/_old 2022-01-07 12:47:32.695893940 +0100 +++ /var/tmp/diff_new_pack.Jzc9X8/_new 2022-01-07 12:47:32.699893943 +0100 @@ -1,7 +1,6 @@ -Index: src/tuxpaint-import.sh -=================================================================== ---- src/tuxpaint-import.sh.orig -+++ src/tuxpaint-import.sh +diff -Nur tuxpaint-0.9.26/src/tuxpaint-import.sh new/src/tuxpaint-import.sh +--- tuxpaint-0.9.26/src/tuxpaint-import.sh 2017-10-10 01:37:05.000000000 +0200 ++++ new/src/tuxpaint-import.sh 2021-10-02 14:11:50.869928504 +0200 @@ -143,7 +143,7 @@ # For each picture list... for x in $(seq 1 $#) ++++++ tuxpaint-makefile.patch ++++++ diff -Nur tuxpaint-0.9.26/Makefile new/Makefile --- tuxpaint-0.9.26/Makefile 2021-06-29 01:46:55.000000000 +0200 +++ new/Makefile 2021-10-02 16:38:32.509556525 +0200 @@ -79,6 +79,7 @@ # <HOSTROOT>/lib Library files. # <HOSTROOT>/lib/pkgconfig *.pc files. # +HOST:= ifdef HOST ifndef HOSTROOT $(error Must set HOSTROOT to cross compile) @@ -924,9 +925,9 @@ xdg-desktop-menu install tux4kids-tuxpaint.desktop ; \ rm ./tux4kids-tuxpaint.desktop ; \ fi - @if [ "x$(shell which update-desktop-database)" != "x" ]; then \ - update-desktop-database ; \ - fi +# @if [ "x$(shell which update-desktop-database)" != "x" ]; then \ +# update-desktop-database ; \ +# fi # Install the PNG icon (for KDE desktop, etc.) # and the 24-color 32x32 XPM (for other Window managers):
