- added extern patch (fixes build with -fno-common, gcc 10+ default); release 5

diff --git a/psiconv-extern.patch b/psiconv-extern.patch
new file mode 100644 (file)
index 0000000..e0863a0
--- /dev/null
+++ b/psiconv-extern.patch
@@ -0,0 +1,22 @@
+--- psiconv-0.9.9/program/psiconv/psiconv.h.orig       2014-10-22 21:46:03.000000000 +0200
++++ psiconv-0.9.9/program/psiconv/psiconv.h    2021-04-04 08:35:02.086782998 +0200
+@@ -52,7 +52,7 @@
+   output_function *output;
+ } *fileformat;
+ 
+-psiconv_list fileformat_list; /* of struct psiconv_fileformat */
++extern psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+ 
+ 
+ #endif /* PSICONV_H */
+--- psiconv-0.9.9/program/psiconv/psiconv.c.orig       2014-10-22 21:45:57.000000000 +0200
++++ psiconv-0.9.9/program/psiconv/psiconv.c    2021-04-04 08:37:16.667059334 +0200
+@@ -48,6 +48,8 @@
+ static void print_version(void);
+ static void strtoupper(char *str);
+ 
++psiconv_list fileformat_list; /* of struct psiconv_fileformat */
++
+ void print_help(void)
+ {
+   fileformat ff;

diff --git a/psiconv.spec b/psiconv.spec
index 4e8614f9692b0d653a0fcd93f440aa1f82457d00..7993842b7707c30d8f3221de99e99e7f36f32d8d 100644 (file)
--- a/psiconv.spec
+++ b/psiconv.spec
@@ -2,13 +2,14 @@ Summary:      Psion 5 data format library
 Summary(pl.UTF-8):     Biblioteka obsługi plików Psion 5
 Name:          psiconv
 Version:       0.9.9
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://www.frodo.looijaard.name/system/files/software/psiconv/%{name}-%{version}.tar.gz
+Source0:       https://www.frodo.looijaard.name/system/files/software/psiconv/%{name}-%{version}.tar.gz
 # Source0-md5: 286e427b10f4d10aaeef1944210a2ea6
 Patch0:                %{name}-magick.patch
-URL:           http://frodo.looijaard.name/project/psiconv
+Patch1:                %{name}-extern.patch
+URL:           https://frodo.looijaard.name/project/psiconv
 BuildRequires: ImageMagick-devel >= 1:6
 BuildRequires: autoconf
 BuildRequires: automake
@@ -64,6 +65,7 @@ Statyczna biblioteka psiconv.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}