From e6122ea08aa6ba2852be8386abbe0a50a04f7a9d7b05c6a21ba70be9da282440 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Mon, 21 Sep 2020 23:36:39 +0000
Subject: [PATCH] Accepting request 835947 from
 home:oertel:branches:Base:System

- add patch pommed-1.39-multiple-def-lcd_bck_info.patch
  to fix link issues in factory. struct is already declared in
  sysfs_backlight

OBS-URL: https://build.opensuse.org/request/show/835947
OBS-URL: https://build.opensuse.org/package/show/Base:System/pommed?expand=0&rev=17
---
 pommed-1.39-multiple-def-lcd_bck_info.patch | 22 +++++++++++++++++++++
 pommed.changes                              |  7 +++++++
 pommed.spec                                 | 10 ++++++----
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 pommed-1.39-multiple-def-lcd_bck_info.patch

diff --git a/pommed-1.39-multiple-def-lcd_bck_info.patch b/pommed-1.39-multiple-def-lcd_bck_info.patch
new file mode 100644
index 0000000..7d00f6b
--- /dev/null
+++ b/pommed-1.39-multiple-def-lcd_bck_info.patch
@@ -0,0 +1,22 @@
+--- pommed-1.39/pommed/mactel/x1600_backlight.c	2020/09/21 23:14:08	1.1
++++ pommed-1.39/pommed/mactel/x1600_backlight.c	2020/09/21 23:14:26
+@@ -45,7 +45,7 @@
+ #include "../dbus.h"
+ 
+ 
+-struct _lcd_bck_info lcd_bck_info;
++extern struct _lcd_bck_info lcd_bck_info;
+ 
+ static int fd = -1;
+ static char *memory = NULL;
+--- pommed-1.39/pommed/mactel/nv8600mgt_backlight.c	2020/09/21 23:14:47	1.1
++++ pommed-1.39/pommed/mactel/nv8600mgt_backlight.c	2020/09/21 23:14:56
+@@ -48,7 +48,7 @@
+ #include "../dbus.h"
+ 
+ 
+-struct _lcd_bck_info lcd_bck_info;
++extern struct _lcd_bck_info lcd_bck_info;
+ 
+ 
+ static int nv8600mgt_inited = 0;
diff --git a/pommed.changes b/pommed.changes
index 8eedbe9..2c24fb9 100644
--- a/pommed.changes
+++ b/pommed.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 22 01:15:46 CEST 2020 - ro@suse.de
+
+- add patch pommed-1.39-multiple-def-lcd_bck_info.patch
+  to fix link issues in factory. struct is already declared in
+  sysfs_backlight
+
 -------------------------------------------------------------------
 Thu Jun  2 13:03:39 UTC 2016 - tchvatal@suse.com
 
diff --git a/pommed.spec b/pommed.spec
index 9b01047..efaa8c3 100644
--- a/pommed.spec
+++ b/pommed.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pommed
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,9 +20,9 @@ Name:           pommed
 Version:        1.39
 Release:        0
 Summary:        Apple laptops hotkeys event handler
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Hardware/Mobile
-Url:            https://launchpad.net/pommed
+URL:            https://launchpad.net/pommed
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        pommed.service
 Source2:        gpomme.desktop
@@ -36,6 +36,7 @@ Patch2:         pommed-1.38-cflags.patch
 Patch3:         pommed-1.38-hardcoded-libpci.patch
 # PATCH-FIX-UPSTREAM pommed-dbus_policy.patch ro@novell.com -- bnc#469771
 Patch4:         pommed-dbus_policy.patch
+Patch5:         pommed-1.39-multiple-def-lcd_bck_info.patch
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(alsa)
@@ -100,6 +101,7 @@ of each item controlled by pommed.
 %patch2 -p1
 %patch3 -p1
 %patch4
+%patch5 -p1
 
 %build
 make %{?_smp_mflags}