Accepting request 862696 from home:StefanBruens:branches:electronics

- Fix duplicate symbol error due to wrong syntax in declaration:
  * 0001-Fix-enum-declarations.patch

OBS-URL: https://build.opensuse.org/request/show/862696
OBS-URL: https://build.opensuse.org/package/show/electronics/gerbv?expand=0&rev=10

0001-Fix-enum-declarations.patch

@@ -0,0 +1,34 @@
+From ca9f29f183152469b36a8b28cd57fb006de899b4 Mon Sep 17 00:00:00 2001
+From: Lars Christensen <larsch@belunktum.dk>
+Date: Sat, 7 Nov 2020 16:13:14 +0100
+Subject: [PATCH] Fix enum declarations
+
+---
+ src/callbacks.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/callbacks.h b/src/callbacks.h
+index c021e1b..a401bac 100644
+--- a/src/callbacks.h
++++ b/src/callbacks.h
+@@ -26,7 +26,7 @@
+     \ingroup gerbv
+ */
+ 
+-enum {
++typedef enum {
+ 	CALLBACKS_SAVE_PROJECT_AS,
+ 	CALLBACKS_SAVE_FILE_PS,
+ 	CALLBACKS_SAVE_FILE_PDF,
+@@ -43,7 +43,7 @@ enum {
+ 	
+ } CALLBACKS_SAVE_FILE_TYPE;
+ 
+-enum {
++typedef enum {
+ 	LAYER_SELECTED =	-1,
+ 	LAYER_ALL_ON =		-2,
+ 	LAYER_ALL_OFF =		-3,
+-- 
+2.29.2
+

gerbv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 12 16:03:06 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix duplicate symbol error due to wrong syntax in declaration:
+  * 0001-Fix-enum-declarations.patch
+
 -------------------------------------------------------------------
 Mon Mar 25 22:26:25 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

gerbv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gerbv
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,8 +24,10 @@ Release:        0
 Summary:        Gerber File Viewer that supports the RS-274X Standard
 License:        GPL-2.0-only
 Group:          Productivity/Scientific/Electronics
-Url:            http://gerbv.geda-project.org/
+URL:            http://gerbv.geda-project.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/gerbv/patches/80/
+Patch0:         0001-Fix-enum-declarations.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel
 BuildRequires:  libpng-devel
@@ -64,7 +66,7 @@ This package contains development files for developing applications
 that use gerbv library.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure  \
@@ -72,7 +74,7 @@ that use gerbv library.
             --enable-unit-mm \
             --disable-update-desktop-database
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install