Hello community,
here is the log from the commit of package tuxpaint for openSUSE:Factory checked in at 2019-03-27 16:21:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tuxpaint (Old)
and /work/SRC/openSUSE:Factory/.tuxpaint.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxpaint"
Wed Mar 27 16:21:42 2019 rev:8 rq:689008 version:0.9.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/tuxpaint/tuxpaint.changes 2018-07-17 09:43:56.956948809 +0200
+++ /work/SRC/openSUSE:Factory/.tuxpaint.new.25356/tuxpaint.changes 2019-03-27 16:21:54.607523429 +0100
@@ -1,0 +2,13 @@
+Tue Mar 26 07:58:30 UTC 2019 - Christophe Giboudeaux
+
+- Fix the previous commit. The build service picked the wrong
+ revision.
+
+-------------------------------------------------------------------
+Mon Mar 25 16:36:02 UTC 2019 - Christophe Giboudeaux
+
+- Add 0001-Prepare-the-kdelibs4-removal.patch to prepare the
+ kdelibs4 removal
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
0001-Prepare-the-kdelibs4-removal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tuxpaint.spec ++++++
--- /var/tmp/diff_new_pack.B1rDYg/_old 2019-03-27 16:21:55.299523285 +0100
+++ /var/tmp/diff_new_pack.B1rDYg/_new 2019-03-27 16:21:55.299523285 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tuxpaint
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,21 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define kderootdir %(kde4-config --prefix || kde-config --prefix)
%define gnomedir %(gnome-config --prefix)
Name: tuxpaint
Version: 0.9.22
Release: 0
Summary: Drawing Program for Young Children
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Graphics/Bitmap Editors
-Url: http://www.tuxpaint.org/
+URL: http://www.tuxpaint.org/
Source: http://sourceforge.net/projects/tuxpaint/files/tuxpaint/%{version}/%{name}-%{version}.tar.gz
Source1: tuxpaint-rpmlintrc
+# PATCH-FIX-OPENSUSE 0001-Prepare-the-kdelibs4-removal.patch
+Patch0: 0001-Prepare-the-kdelibs4-removal.patch
Patch1: tuxpaint-import-eval.patch
# PATCH-FIX-UPSTREAM bmwiedemann boo#1047218
Patch2: reproducible.patch
@@ -40,7 +41,6 @@
BuildRequires: libpaper-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# openSUSE
#
@@ -55,8 +55,6 @@
Requires: netpbm
Recommends: tuxpaint-config
Recommends: tuxpaint-stamps
-# Makefile uses kde-config to detect KDE_PREFIX
-BuildRequires: kdelibs4-core
%endif
#
# Fedora
@@ -110,6 +108,7 @@
%prep
%setup -q
+%patch0 -p1
%patch1 -b .import-eval-patch
%patch2 -b .reproducible
find . -name CVS -print0 | xargs -0 rm -rf
@@ -160,12 +159,11 @@
%find_lang %{name}
%files -f %{name}.lang
-%defattr(-,root,root)
%if 0%{?suse_version}
%doc %{_defaultdocdir}/%{name}
%endif
-%doc %{_mandir}/man1/tuxpaint*
-%doc %{_mandir}/pl/man1/tuxpaint.1*
+%{_mandir}/man1/tuxpaint*
+%{_mandir}/pl/man1/tuxpaint.1%{?ext_man}
%dir %{_sysconfdir}/%{name}
%dir %{_mandir}/pl
%dir %{_mandir}/pl/man1
@@ -177,7 +175,7 @@
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.*
%{_datadir}/applications/*.desktop
-%{kderootdir}/share/icons/hicolor
+%{_datadir}/icons/hicolor
%if 0%{?suse_version} <= 1130
# locales not in official openSUSE distribution
%dir %{_datadir}/locale/en_ZA
@@ -203,11 +201,10 @@
%endif
%files devel
-%defattr(-,root,root)
%if 0%{?suse_version}
%doc %{_defaultdocdir}/%{name}-devel
%endif
-%doc %{_mandir}/man1/tp-magic-config*
+%{_mandir}/man1/tp-magic-config*
%dir %{_includedir}/%{name}
%{_bindir}/tp-magic-config
%{_includedir}/%{name}/*
++++++ 0001-Prepare-the-kdelibs4-removal.patch ++++++
From c4fbcd54d3e58076ba6ec79f4af82744de54aecc Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
Date: Mon, 25 Mar 2019 17:29:44 +0100
Subject: [PATCH] Prepare the kdelibs4 removal.
kdelibs is only used to get installation path. we'll hardcode them instead.
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 730ed91..be386d8 100644
--- a/Makefile
+++ b/Makefile
@@ -165,8 +165,8 @@ endif
ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
-KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
-KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
+KDE_PREFIX:=$(DESTDIR)$(PREFIX)/share/applications
+KDE_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/icons
# Maemo flag
MAEMOFLAG:=
--
2.21.0