From 6f0ec9c4fc2ba8f1c1652d98dfafbb20d03e965a Mon Sep 17 00:00:00 2001
From: Erich Cordoba <erich.cordoba.malibran@intel.com>
Date: Tue, 24 Sep 2019 11:12:01 -0500
Subject: [PATCH] Change %autosetup for opensuse specfiles

As the tarballs are now created by the _service definition in the
opensuse build system, it requires now to include the specfiles
within the tarballs. This means that the `-n` option needs to be
set for `%autosetup`.

Story: 2006508
Task: 36780

Change-Id: Ib89a440d4911200ead2a3a35d731564e86b0b447
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
---
 fm-common/opensuse/fm-common.spec             | 2 +-
 fm-doc/opensuse/fm-doc.spec                   | 2 +-
 fm-mgr/opensuse/fm-mgr.spec                   | 2 +-
 fm-rest-api/opensuse/fm-rest-api.spec         | 2 +-
 python-fmclient/opensuse/python-fmclient.spec | 2 +-
 snmp-audittrail/opensuse/snmp-audittrail.spec | 2 +-
 snmp-ext/opensuse/snmp-ext.spec               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fm-common/opensuse/fm-common.spec b/fm-common/opensuse/fm-common.spec
index d879b251..9598d310 100644
--- a/fm-common/opensuse/fm-common.spec
+++ b/fm-common/opensuse/fm-common.spec
@@ -43,7 +43,7 @@ Contains fmAlarm.h which is to be used by fm-doc package to validate
 the Alarms & Logs Doc Yaml file
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/sources
 
 %build
 VER=%{version}
diff --git a/fm-doc/opensuse/fm-doc.spec b/fm-doc/opensuse/fm-doc.spec
index 70a24d62..0def2d00 100644
--- a/fm-doc/opensuse/fm-doc.spec
+++ b/fm-doc/opensuse/fm-doc.spec
@@ -19,7 +19,7 @@ checker to ensure no duplicate IDs are used, and generally the correct
 field values are documented.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/fm_doc
 
 %build
 
diff --git a/fm-mgr/opensuse/fm-mgr.spec b/fm-mgr/opensuse/fm-mgr.spec
index a76e84ad..8ddc5fcf 100644
--- a/fm-mgr/opensuse/fm-mgr.spec
+++ b/fm-mgr/opensuse/fm-mgr.spec
@@ -22,7 +22,7 @@ application fault management requests and raise/clear/update
 alarms in the active alarm database.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/sources
 
 %build
 VER=%{version}
diff --git a/fm-rest-api/opensuse/fm-rest-api.spec b/fm-rest-api/opensuse/fm-rest-api.spec
index 8db2a42e..28411212 100644
--- a/fm-rest-api/opensuse/fm-rest-api.spec
+++ b/fm-rest-api/opensuse/fm-rest-api.spec
@@ -31,7 +31,7 @@ Fault Management Openstack REST API Service
 %define debug_package %{nil}
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/fm
 
 # Remove bundled egg-info
 rm -rf *.egg-info
diff --git a/python-fmclient/opensuse/python-fmclient.spec b/python-fmclient/opensuse/python-fmclient.spec
index 98b303cc..1196569d 100644
--- a/python-fmclient/opensuse/python-fmclient.spec
+++ b/python-fmclient/opensuse/python-fmclient.spec
@@ -33,7 +33,7 @@ A python client library for StarlingX Fault Management service
 %define debug_package %{nil}
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/fmclient
 
 # Remove bundled egg-info
 rm -rf *.egg-info
diff --git a/snmp-audittrail/opensuse/snmp-audittrail.spec b/snmp-audittrail/opensuse/snmp-audittrail.spec
index b6a4b212..7b6123c3 100644
--- a/snmp-audittrail/opensuse/snmp-audittrail.spec
+++ b/snmp-audittrail/opensuse/snmp-audittrail.spec
@@ -31,7 +31,7 @@ This package contains symbolic links, header files, and related items necessary
 for software development.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/sources
 
 %build
 VER=%{version}
diff --git a/snmp-ext/opensuse/snmp-ext.spec b/snmp-ext/opensuse/snmp-ext.spec
index 35599c49..94fb31cf 100644
--- a/snmp-ext/opensuse/snmp-ext.spec
+++ b/snmp-ext/opensuse/snmp-ext.spec
@@ -33,7 +33,7 @@ System.  This package contains symbolic links, header files, and related
 items necessary for software development.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/sources
 
 %build
 MAJOR=`echo %{version} | awk -F . '{print $1}'`