Hello community,
here is the log from the commit of package xournal for openSUSE:Factory checked in at 2020-09-30 19:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xournal (Old)
and /work/SRC/openSUSE:Factory/.xournal.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xournal"
Wed Sep 30 19:55:28 2020 rev:34 rq:838753 version:0.4.8.2016
Changes:
--------
--- /work/SRC/openSUSE:Factory/xournal/xournal.changes 2018-02-25 11:47:21.379747389 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new.4249/xournal.changes 2020-09-30 19:55:40.392853465 +0200
@@ -1,0 +2,5 @@
+Wed Sep 30 11:03:21 UTC 2020 - Ferdinand Thiessen
+
+- Fixed build on Tumbleweed: New commandline options from inkscape
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xournal.spec ++++++
--- /var/tmp/diff_new_pack.n9km9C/_old 2020-09-30 19:55:41.028854033 +0200
+++ /var/tmp/diff_new_pack.n9km9C/_new 2020-09-30 19:55:41.032854037 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xournal
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
#
@@ -22,7 +22,7 @@
Summary: An application for notetaking, sketching, and keeping a journal using a stylus
License: GPL-2.0-or-later
Group: Productivity/Office/Other
-Url: http://xournal.sourceforge.net/
+URL: http://xournal.sourceforge.net/
Source: http://download.sf.net/xournal/%{name}-%{version}.tar.gz
Patch0: %{name}-implicit-funcs.patch
# PATCH-FIX-UPSTREAM xournal-Improve-window-title.patch -- https://sourceforge.net/p/xournal/patches/79/
@@ -36,6 +36,7 @@
BuildRequires: hicolor-icon-theme
BuildRequires: inkscape
BuildRequires: intltool
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(cairo)
@@ -54,8 +55,6 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(zlib)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
%description
Xournal is an application for notetaking, sketching, and keeping a journal
using a stylus. You can also use it to annotate PDF files with scribbles or
@@ -74,21 +73,26 @@
autoreconf -fi
intltoolize --force
%configure
-make %{?_smp_mflags}
+%make_build
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
make DESTDIR=%{buildroot} desktop-install
+%if 0%{?suse_version} > 1500
+export EXPORT="--export-filename"
+%else
+export EXPORT="-e"
+%endif
# GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR
-for i in 24 32 48 64 128 256
+for i in 64 128 256
do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes
inkscape -w ${i} -C pixmaps/%{name}.svg \
- -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+ $EXPORT %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
inkscape -w ${i} -C pixmaps/xoj.svg \
- -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
+ $EXPORT %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
done
%suse_update_desktop_file %{name}
@@ -111,7 +115,6 @@
%mime_database_postun
%files -f %{name}.lang
-%defattr(-, root, root)
%doc %{_docdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
@@ -120,6 +123,7 @@
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/icons/hicolor/*/mimetypes/*xoj.*
%{_datadir}/mime/packages/xournal.xml
+%dir %{_datadir}/mime/application
%{_datadir}/mime/application/x-xoj.xml
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application