From b6b3a6ad9a5497e263929ba4b2e66a9206737160 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Feb 26 2020 17:30:25 +0000 Subject: 0.9.23, drop python dep. --- diff --git a/.gitignore b/.gitignore index 5076c1a..92969c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tuxpaint-0.9.21.tar.gz /tuxpaint-0.9.22.tar.gz +/tuxpaint-0.9.23.tar.gz diff --git a/sources b/sources index 95438ce..8d8529b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb9d7e4460ed8084be23b5dfcbf49ef3 tuxpaint-0.9.22.tar.gz +SHA512 (tuxpaint-0.9.23.tar.gz) = 540590c401256a2a37d18c77dbc4130d83b015572ac8e9ef03a8c09ea11d2bfbcc8cfcf7e3b221846f6f67d1eaab9b777da15bb0c97561f5cb421e70a8e4615f diff --git a/tuxpaint-0.9.20-fix-desktop-file.patch b/tuxpaint-0.9.20-fix-desktop-file.patch deleted file mode 100644 index c7ce6d9..0000000 --- a/tuxpaint-0.9.20-fix-desktop-file.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop ---- tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile 2008-09-08 20:45:08.000000000 -0400 -+++ tuxpaint-0.9.20/src/tuxpaint.desktop 2008-09-08 20:45:22.000000000 -0400 -@@ -74,7 +74,7 @@ Type=Application - Exec=tuxpaint - Icon=tuxpaint - Terminal=false --Categories=Education; Art; -+Categories=Education;Graphics; - GenericName=Drawing program - GenericName[af]=Tekenprogram - GenericName[ar]=برنامج رسم -diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop.in ---- tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile 2008-04-03 12:48:50.000000000 -0400 -+++ tuxpaint-0.9.20/src/tuxpaint.desktop.in 2008-09-08 20:45:30.000000000 -0400 -@@ -5,6 +5,6 @@ Type=Application - Exec=tuxpaint - Icon=tuxpaint - Terminal=false --Categories=Education; Art; -+Categories=Education;Graphics; - _GenericName=Drawing program - _Comment=A drawing program for children. diff --git a/tuxpaint-0.9.21-link.patch b/tuxpaint-0.9.21-link.patch deleted file mode 100644 index 4382474..0000000 --- a/tuxpaint-0.9.21-link.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f537219097c499a38d8a4a2b06c14a6e9d54605c Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 2 Mar 2010 12:52:01 +0100 -Subject: [PATCH] Fix link - ---- - Makefile | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 67be2ba..52d0f40 100644 ---- a/Makefile -+++ b/Makefile -@@ -77,10 +77,12 @@ PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) - FRIBIDI_LIB:=$(shell pkg-config --libs fribidi) - FRIBIDI_CFLAGS:=$(shell pkg-config --cflags fribidi) - --windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) -+COMMON_LIB=-lm -lz -+ -+windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) - osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) --beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)" --linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -+beos_ARCH_LINKS:=-lintl $(PNG) -lbe -liconv $(FRIBIDI_LIB) $(COMMON_LIB) -+linux_ARCH_LINKS:=$(PNG) $(FRIBIDI_LIB) $(PAPER_LIB) $(COMMON_LIB) - ARCH_LINKS:=$($(OS)_ARCH_LINKS) - - windows_ARCH_HEADERS:=src/win32_print.h --- -1.7.0 - diff --git a/tuxpaint-0.9.21-memset.patch b/tuxpaint-0.9.21-memset.patch deleted file mode 100644 index 4396cc3..0000000 --- a/tuxpaint-0.9.21-memset.patch +++ /dev/null @@ -1,25 +0,0 @@ -From da064f6c8b2bcbc7f8fb00fbdc49ba3b2f0543ac Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 2 Mar 2010 12:54:08 +0100 -Subject: [PATCH 2/2] Fix memset argument order - ---- - src/tuxpaint.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/tuxpaint.c b/src/tuxpaint.c -index 6047cbb..145fb10 100644 ---- a/src/tuxpaint.c -+++ b/src/tuxpaint.c -@@ -1130,7 +1130,7 @@ static SDL_Surface *render_text_w(TuxPaint_Font * restrict font, - - utfstr_max = (sizeof(char) * 4 * (wcslen(str) + 1)); - utfstr = (char *) malloc(utfstr_max); -- memset(utfstr, utfstr_max, 0); -+ memset(utfstr, 0, utfstr_max); - - j = 0; - for (i = 0; i < wcslen(str); i++) --- -1.7.0 - diff --git a/tuxpaint-0.9.21-png15.patch b/tuxpaint-0.9.21-png15.patch deleted file mode 100644 index 00e72ce..0000000 --- a/tuxpaint-0.9.21-png15.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up tuxpaint-0.9.21/src/tuxpaint.c.png15 tuxpaint-0.9.21/src/tuxpaint.c ---- tuxpaint-0.9.21/src/tuxpaint.c.png15 2012-03-22 09:32:19.347356715 -0400 -+++ tuxpaint-0.9.21/src/tuxpaint.c 2012-03-22 09:45:06.547102782 -0400 -@@ -12898,12 +12898,16 @@ static int do_png_save(FILE * fi, const - { - png_init_io(png_ptr, fi); - -+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) -+ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); -+#else - info_ptr->width = surf->w; - info_ptr->height = surf->h; - info_ptr->bit_depth = 8; - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - info_ptr->interlace_type = 1; - info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ -+#endif - - png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, - PNG_sRGB_INTENT_PERCEPTUAL); diff --git a/tuxpaint-utf8.patch b/tuxpaint-utf8.patch deleted file mode 100644 index e155a73..0000000 --- a/tuxpaint-utf8.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up tuxpaint-0.9.17/src/manpage/tuxpaint.1.orig tuxpaint-0.9.17/src/manpage/tuxpaint.1 ---- tuxpaint-0.9.17/src/manpage/tuxpaint.1.orig 2007-07-01 10:51:32.000000000 -0400 -+++ tuxpaint-0.9.17/src/manpage/tuxpaint.1 2008-09-08 18:04:28.000000000 -0400 -@@ -679,12 +679,12 @@ Roland Illig, - Juan Irigoien, - Dmitriy Ivanov, - Mogens Jaeger, --Lis G�the � J�kupsstovu, -+Lis Gøthe í Jákupsstovu, - Nedjeljko Jedvaj, - Aleksandar Jelenak, - Rasmus Erik Voel Jensen, - Wang Jian, --Amed �. Jiyan, -+Amed Ç. Jiyan, - Petri Jooste, - Richard June, - Andrej Kacian, diff --git a/tuxpaint.spec b/tuxpaint.spec index 9aa8721..ea00eab 100644 --- a/tuxpaint.spec +++ b/tuxpaint.spec @@ -1,6 +1,6 @@ Name: tuxpaint -Version: 0.9.22 -Release: 12%{?dist} +Version: 0.9.23 +Release: 1%{?dist} Epoch: 1 Summary: Drawing program designed for young children @@ -8,17 +8,13 @@ Summary: Drawing program designed for young children License: GPLv2+ URL: http://www.tuxpaint.org/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz -#Patch0: tuxpaint-utf8.patch Patch1: tuxpaint-0.9.21-fix-desktop-file.patch Patch2: tuxpaint-0.9.22-link.patch Patch3: tuxpaint-0.9.21-makej.patch -#Patch4: tuxpaint-0.9.21-memset.patch -#Patch5: tuxpaint-0.9.21-png15.patch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: python2 BuildRequires: SDL-devel >= 1.2.4 BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel @@ -33,6 +29,7 @@ BuildRequires: librsvg2-devel BuildRequires: netpbm-devel BuildRequires: fribidi-devel BuildRequires: gperf +BuildRequires: kdelibs # This should guarantee the proper permissions on # all of the /usr/share/icons/hicolor/* directories. @@ -52,12 +49,9 @@ Development files for tuxpaint extensions/plugins %prep %setup -q -#%%patch0 -p1 %patch1 -p0 -b .fixdesktopfile %patch2 -p0 -b .link %patch3 -p1 -b .makej -#%%patch4 -p1 -b .memset -#%%patch5 -p1 -b .png15 sed -i -e '/\/gnome\/apps\/Graphics/d' Makefile find docs -type f -exec perl -pi -e 's/\r\n/\n/' {} \; @@ -75,7 +69,6 @@ make %{?_smp_mflags} \ MAGIC_PREFIX=%{_libdir}/tuxpaint/plugins %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} make install PKG_ROOT=$RPM_BUILD_ROOT PREFIX=%{_usr} \ @@ -90,7 +83,7 @@ find $RPM_BUILD_ROOT -type d|xargs chmod 0755 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category KidsGame \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/tuxpaint.desktop + src/tuxpaint.desktop # Register as an application to be visible in the software center # @@ -156,10 +149,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_sysconfdir}/bash_completion.d/tuxpaint-completion.bash %files devel -%doc %{_datadir}/doc/%{name}-dev/ +%doc %{_datadir}/doc/%{name}-%{version}/ %{_includedir}/tuxpaint/ %changelog +* Wed Feb 26 2020 Gwyn Ciesla - 1:0.9.23-1 +- 0.9.23 + * Fri Jan 31 2020 Fedora Release Engineering - 1:0.9.22-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild