From 2eedf10377e35059435af9ef338718a0b05971546ffa4653af846f3806107aa2 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 3 Feb 2017 11:34:20 +0000
Subject: [PATCH 1/2] - make the driver default for Tumbleweed (upcoming Leap
 42.3,   sle13, ...), if "amdgpu" is the kernel driver of the device;   still
 use device list specified in amdgpu.ids for older   distributions like Leap
 42.2, sle12, ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-amdgpu?expand=0&rev=25
---
 xf86-video-amdgpu.changes | 8 ++++++++
 xf86-video-amdgpu.spec    | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/xf86-video-amdgpu.changes b/xf86-video-amdgpu.changes
index b708871..784fd68 100644
--- a/xf86-video-amdgpu.changes
+++ b/xf86-video-amdgpu.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb  3 11:05:07 UTC 2017 - sndirsch@suse.com
+
+- make the driver default for Tumbleweed (upcoming Leap 42.3,
+  sle13, ...), if "amdgpu" is the kernel driver of the device;
+  still use device list specified in amdgpu.ids for older
+  distributions like Leap 42.2, sle12, ...
+
 -------------------------------------------------------------------
 Mon Jan 30 11:30:56 UTC 2017 - sndirsch@suse.com
 
diff --git a/xf86-video-amdgpu.spec b/xf86-video-amdgpu.spec
index c944177..fb16660 100644
--- a/xf86-video-amdgpu.spec
+++ b/xf86-video-amdgpu.spec
@@ -17,7 +17,7 @@
 
 
 #
-%if 0%{?suse_version} >= 1330 
+%if 0%{?suse_version} < 1330
 %define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids
 %endif
 
@@ -73,8 +73,8 @@ make %{?_smp_mflags}
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-rm -f %{buildroot}%{_datadir}/X11/xorg.conf.d/10-amdgpu.conf
 %if 0%{?pci_ids_dir:1}
+rm -f %{buildroot}%{_datadir}/X11/xorg.conf.d/10-amdgpu.conf
 %{__mkdir_p} %{buildroot}%{pci_ids_dir}
 cp %{S:3} %{buildroot}%{pci_ids_dir}/
 %endif
@@ -86,7 +86,9 @@ cp %{S:3} %{buildroot}%{pci_ids_dir}/
 %{_libdir}/xorg/modules/drivers/amdgpu_drv.so
 %{_mandir}/man4/amdgpu.4%{?ext_man}
 %if 0%{?pci_ids_dir:1}
-%config %{pci_ids_dir}/amdgpu.ids
+%{pci_ids_dir}/amdgpu.ids
+%else
+%config %{_datadir}/X11/xorg.conf.d/10-amdgpu.conf
 %endif
 
 %changelog

From 01113c97df100ff5a25abeeff6deda45294b16bb2587a356497583400b7542b8 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 3 Feb 2017 12:03:36 +0000
Subject: [PATCH 2/2] move 10-amdgpu.conf to /etc/X11/xorg.conf.d

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-amdgpu?expand=0&rev=26
---
 xf86-video-amdgpu.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xf86-video-amdgpu.spec b/xf86-video-amdgpu.spec
index fb16660..40f9f31 100644
--- a/xf86-video-amdgpu.spec
+++ b/xf86-video-amdgpu.spec
@@ -77,6 +77,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 rm -f %{buildroot}%{_datadir}/X11/xorg.conf.d/10-amdgpu.conf
 %{__mkdir_p} %{buildroot}%{pci_ids_dir}
 cp %{S:3} %{buildroot}%{pci_ids_dir}/
+%else
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+mv %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-amdgpu.conf \
+   %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 %endif
 
 %files
@@ -88,7 +92,7 @@ cp %{S:3} %{buildroot}%{pci_ids_dir}/
 %if 0%{?pci_ids_dir:1}
 %{pci_ids_dir}/amdgpu.ids
 %else
-%config %{_datadir}/X11/xorg.conf.d/10-amdgpu.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/10-amdgpu.conf
 %endif
 
 %changelog