From baae04fe944ddc29abc451e4addbf8b2edfd4338 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 27 Sep 2020 14:58:01 +0200
Subject: [PATCH] - added no-common patch (fix build with -fno-common, gcc 10
 default) - release 2

---
 glabels-no-common.patch | 22 ++++++++++++++++++++++
 glabels.spec            |  8 +++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 glabels-no-common.patch

diff --git a/glabels-no-common.patch b/glabels-no-common.patch
new file mode 100644
index 0000000..78ac3be
--- /dev/null
+++ b/glabels-no-common.patch
@@ -0,0 +1,22 @@
+--- glabels-3.4.1/src/template-history.h.orig	2016-03-04 05:01:15.000000000 +0100
++++ glabels-3.4.1/src/template-history.h	2020-09-27 14:43:16.510439592 +0200
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+ 
+ 
+-glTemplateHistoryModel *gl_template_history;
++extern glTemplateHistoryModel *gl_template_history;
+ 
+ 
+ void            gl_template_history_init (void);
+--- glabels-3.4.1/src/font-history.h.orig	2016-03-04 05:01:15.000000000 +0100
++++ glabels-3.4.1/src/font-history.h	2020-09-27 14:43:46.635333431 +0200
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+ 
+ 
+-glFontHistoryModel *gl_font_history;
++extern glFontHistoryModel *gl_font_history;
+ 
+ 
+ void            gl_font_history_init (void);
diff --git a/glabels.spec b/glabels.spec
index 7ba5962..eec4304 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -2,12 +2,13 @@ Summary:	gLabels - a GNOME program to create labels and business cards
 Summary(pl.UTF-8):	gLabels - program dla GNOME do tworzenia etykiet i wizytówek
 Name:		glabels
 Version:	3.4.1
-Release:	1
+Release:	2
 License:	GPL v3+ (libraries: LGPL v3+)
 Group:		X11/Applications/Graphics
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/%{name}-%{version}.tar.xz
 # Source0-md5:	095105ac95872bd9a767764fa60d5152
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-no-common.patch
 URL:		http://www.glabels.org/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
@@ -28,7 +29,7 @@ BuildRequires:	libxml2-devel >= 1:2.9.0
 BuildRequires:	pango-devel >= 1:1.36.0
 BuildRequires:	pkgconfig
 BuildRequires:	qrencode-devel >= 3.1.0
-BuildRequires:	rpmbuild(macros) >= 1.592
+BuildRequires:	rpmbuild(macros) >= 1.748
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	yelp-tools
@@ -108,7 +109,7 @@ Summary(pl.UTF-8):	Dokumentacja API biblioteki glabels
 License:	CC-BY-SA v3.0
 Group:		Documentation
 Requires:	gtk-doc-common
-%if "%{_rpmversion}" >= "5"
+%if 0%{?_ver_ge "%{_rpmversion}" "4.6"}
 BuildArch:	noarch
 %endif
 
@@ -121,6 +122,7 @@ Dokumentacja API biblioteki glabels.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__glib_gettextize}
-- 
2.44.0