Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1,3 +1,4 @@
 xournal-0.4.5.tar.gz
 /xournal-0.4.7.tar.gz
 /xournal-0.4.8.tar.gz
+/xournal-0.4.8.2016.tar.gz

sources

@@ -1 +1 @@
-d47acd6987b9fccf2ccdd65878667c79  xournal-0.4.8.tar.gz
+SHA512 (xournal-0.4.8.2016.tar.gz) = 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e

xournal-c99-1.patch

@@ -0,0 +1,78 @@
+commit 430d9502547856943df531b700bb5843fcc8bd1f
+Author: Denis Auroux <auroux@users.sourceforge.net>
+Date:   Sun Jan 24 15:48:16 2021 -0500
+
+    Fix implicit function declarations by including config.h in ttsubset/*.c
+
+diff --git a/src/ttsubset/list.c b/src/ttsubset/list.c
+index 0cf958e43468c5ee..6b764ae7dabbe0ef 100644
+--- a/src/ttsubset/list.c
++++ b/src/ttsubset/list.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */
+ /* @(#)list.c 1.7 03/02/06 SMI */
+ 
+ /*
+@@ -44,6 +44,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <stdlib.h>
+ #include <assert.h>
+ #ifdef MALLOC_TRACE
+diff --git a/src/ttsubset/sft.c b/src/ttsubset/sft.c
+index 249fbdf03b074575..678359eb580f9b56 100644
+--- a/src/ttsubset/sft.c
++++ b/src/ttsubset/sft.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)sft.c 1.17 03/01/08 SMI */
+ 
+ /*
+@@ -43,6 +43,10 @@
+  * @version 1.0
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/ttsubset/ttcr.c b/src/ttsubset/ttcr.c
+index eecfcade1a5f1b5d..38962def32de00c3 100644
+--- a/src/ttsubset/ttcr.c
++++ b/src/ttsubset/ttcr.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)ttcr.c 1.7 03/01/08 SMI */
+ 
+ /*
+@@ -44,6 +44,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>

xournal-c99-2.patch

@@ -0,0 +1,17 @@
+Add missing include directives for make_dashed, set_cursor_busy.
+
+Submitted upstream: <https://sourceforge.net/p/xournal/patches/93/>
+
+diff --git a/src/xo-image.c b/src/xo-image.c
+index c16f8f40897e064e..5624a46c3a35d287 100644
+--- a/src/xo-image.c
++++ b/src/xo-image.c
+@@ -25,6 +25,8 @@
+ #include "xo-support.h"
+ #include "xo-image.h"
+ #include "xo-misc.h"
++#include "xo-selection.h"
++#include "xo-paint.h"
+ 
+ // create pixbuf from buffer, or return NULL on failure
+ GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen)

xournal.spec

@@ -1,13 +1,17 @@
 Name:		xournal
-Version:	0.4.8
-Release:	9%{?dist}
+Version:	0.4.8.2016
+Release:	21%{?dist}
 Summary:	Notetaking, sketching, PDF annotation and general journal
 
-Group:		Applications/Editors
-License:	GPLv2
+# Automatically converted from old format: GPLv2 - review is highly recommended.
+License:	GPL-2.0-only
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
+Patch0:		xournal-c99-1.patch
+Patch1:		xournal-c99-2.patch
 
+BuildRequires: make
+BuildRequires:  gcc
 BuildRequires:	gtk2-devel >= 2.10.0
 BuildRequires:	libgnomecanvas-devel >= 2.4.0
 %if 0%{?fedora} > 9 || 0%{?rhel} > 5
@@ -15,9 +19,7 @@ BuildRequires:	poppler-glib-devel >= 0.5.4
 %else
 BuildRequires:	poppler-devel >= 0.5.4
 %endif
-%if 0%{?rhel} > 4
 BuildRequires:	autoconf, automake
-%endif
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
@@ -32,7 +34,7 @@ annotating PDFs. Xournal aims to provide superior graphical quality (subpixel
 resolution) and overall functionality.
 
 %prep
-%setup -q
+%autosetup -p1
 
 NOCONFIGURE=1 ./autogen.sh
 
@@ -72,24 +74,6 @@ desktop-file-install \
 
 %find_lang %{name}
 
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-update-desktop-database &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-update-desktop-database &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
 %files -f %{name}.lang
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -104,6 +88,79 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Jul  29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.4.8.2016-17
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Dec  6 2022 Florian Weimer <fweimer@redhat.com> - 0.4.8.2016-12
+- Port to C99
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-7
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 0.4.8.2016-4
+- Rebuild for poppler-0.84.0
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8.2016-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 14 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.4.8.2016-1
+- Update to 0.4.8.2016.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue May 29 2018 Nathanael Noblet <nathanael@gnat.ca> - 0.4.8-11
+- Fix build error by adding automake/autoconf as a BuildRequirement
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
@@ -217,7 +274,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.4.2.1-2
-- Fix Patch0:/%%patch mismatch (#463069)
+- Fix Patch0:/patch mismatch (#463069)
 
 * Mon Apr  7 2008 Jeremy Katz <katzj@redhat.com> - 0.4.2.1-1
 - Update to 0.4.2.1 to fix problems with newer xorg