From c8bebbbe5c764ad9df33d967378edc68c66ee1867ef26ae3986fde0805047cf3 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Tue, 7 Jul 2020 11:45:55 +0000 Subject: [PATCH] Accepting request 819215 from home:alois:branches:graphics - Add GPL-3.0-or-later license on account of the libqtmypaint and libraster* plugins - Add tupitube-rpmlintrc - Fix some rpmlint complaints OBS-URL: https://build.opensuse.org/request/show/819215 OBS-URL: https://build.opensuse.org/package/show/graphics/tupitube?expand=0&rev=9 --- tupitube-rpmlintrc | 3 +++ tupitube.changes | 8 ++++++++ tupitube.spec | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 tupitube-rpmlintrc diff --git a/tupitube-rpmlintrc b/tupitube-rpmlintrc new file mode 100644 index 0000000..bcbcf49 --- /dev/null +++ b/tupitube-rpmlintrc @@ -0,0 +1,3 @@ +# false positive +addFilter("unexpanded-macro.*Opaque.*") + diff --git a/tupitube.changes b/tupitube.changes index ca35051..336b23f 100644 --- a/tupitube.changes +++ b/tupitube.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 7 10:50:01 UTC 2020 - Luigi Baldoni + +- Add GPL-3.0-or-later license on account of the libqtmypaint and + libraster* plugins +- Add tupitube-rpmlintrc +- Fix some rpmlint complaints + ------------------------------------------------------------------- Thu Jun 4 21:14:42 UTC 2020 - Christophe Giboudeaux diff --git a/tupitube.spec b/tupitube.spec index aa95e93..7fa16f6 100644 --- a/tupitube.spec +++ b/tupitube.spec @@ -25,10 +25,11 @@ Name: tupitube Version: 0.2.15 Release: 0 Summary: 2D vectorial/animation tool -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND GPL-3.0-or-later Group: Productivity/Graphics/Vector Editors URL: https://maefloresta.com Source0: https://sourceforge.net/projects/tupi2d/files/Source%20Code/tupitube.desk-%{version}.tar.gz +Source99: tupitube-rpmlintrc Patch0: tupitube.quazip5.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Fix-build-with-Qt-5.15.patch @@ -93,7 +94,7 @@ This package contains plugins for %{name}. %autosetup -p1 -n tupitube.desk # Fix 'E: spurious-executable-perm' -chmod -x COPYING README* +chmod -x COPYING README* launcher/tupitube.xml # Fix 'W: wrong-script-end-of-line-encoding' dos2unix src/shell/html/css/tupitube.css @@ -104,6 +105,9 @@ find . -type f -name \*.pro | while read f; do echo "QMAKE_CXXFLAGS += %{optflags} ${ffmpeg_include}" >> "$f" done +# Remove shebang +sed -i '/^#!/d' src/mypaint/raster/main/brushes/label-brush-mypaint.sh + %build %configure \ --with-qtdir=%{_qtdir} \