- added no-common patch (fixes build with -fno-common, gcc 10 default); release 2

diff --git a/scute-no-common.patch b/scute-no-common.patch
new file mode 100644 (file)
index 0000000..26bdd15
--- /dev/null
+++ b/scute-no-common.patch
@@ -0,0 +1,27 @@
+--- scute-1.7.0/src/options.h.orig     2020-08-07 09:44:16.000000000 +0200
++++ scute-1.7.0/src/options.h  2021-01-17 13:21:19.962518416 +0100
+@@ -22,10 +22,11 @@
+ #define OPTIONS_H 1
+ 
+ /* Global options.  */
+-struct {
++typedef struct {
+   char *user;
+   int debug_flags;
+-} _scute_opt;
++} _scute_opt_t;
++extern _scute_opt_t _scute_opt;
+ 
+ 
+ /*-- readconf.c --*/
+--- scute-1.7.0/src/readconf.c.orig    2020-08-07 09:45:18.000000000 +0200
++++ scute-1.7.0/src/readconf.c 2021-01-17 14:17:02.055889965 +0100
+@@ -31,6 +31,8 @@
+ 
+ #include "options.h"
+ 
++_scute_opt_t _scute_opt;
++
+ static const char *
+ my_strusage (int level)
+ {

diff --git a/scute.spec b/scute.spec
index d6845606bcd658030a09a542b4e5d99613cd45fc..bca8b527ad52cdd6d6d48018e859a8115bd2758b 100644 (file)
--- a/scute.spec
+++ b/scute.spec
@@ -2,12 +2,13 @@ Summary:      PKCS#11 implementation of GnuPG Agent using the GnuPG Smart Card Daemon
 Summary(pl.UTF-8):     Implementacja PKCS#11 Agenta GnuPG przy użyciu GnuPG Smart Card Daemona
 Name:          scute
 Version:       1.7.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Applications
 Source0:       ftp://ftp.gnupg.org/gcrypt/scute/%{name}-%{version}.tar.bz2
 # Source0-md5: eb0fc903761c63494ef74c1000a349de
 Patch0:                %{name}-info.patch
+Patch1:                %{name}-no-common.patch
 URL:           http://www.gnupg.org/
 BuildRequires: ImageMagick
 BuildRequires: autoconf >= 2.61
@@ -41,6 +42,7 @@ klientów przy użyciu SSL w Mozilli.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}