From 35f721cd5e2adb70665e5084e8c88cc65c7693b7 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 24 Sep 2019 13:11:19 -0700 Subject: [PATCH] openSUSE specfiles fix-up The last merge was not fully tested when it got merged, this cleans up some issues with the openSUSE specfiles. Change-Id: I9a56890877b2e0bfcc759c4acef5a985977b1995 Signed-off-by: Saul Wold --- .../opensuse/puppet-dcdbsync.spec | 39 +++++++++++-------- .../opensuse/puppet-dcmanager.spec | 4 +- .../puppet-dcorch/opensuse/puppet-dcorch.spec | 2 +- modules/puppet-fm/opensuse/puppet-fm.spec | 4 +- modules/puppet-mtce/opensuse/puppet-mtce.spec | 4 +- modules/puppet-nfv/opensuse/puppet-nfv.spec | 4 +- .../opensuse/puppet-patching.spec | 4 +- .../puppet-smapi/opensuse/puppet-smapi.spec | 4 +- modules/puppet-sshd/opensuse/puppet-sshd.spec | 4 +- .../puppet-sysinv/opensuse/puppet-sysinv.spec | 4 +- 10 files changed, 39 insertions(+), 34 deletions(-) diff --git a/modules/puppet-dcdbsync/opensuse/puppet-dcdbsync.spec b/modules/puppet-dcdbsync/opensuse/puppet-dcdbsync.spec index c22fae18..c861c779 100644 --- a/modules/puppet-dcdbsync/opensuse/puppet-dcdbsync.spec +++ b/modules/puppet-dcdbsync/opensuse/puppet-dcdbsync.spec @@ -1,33 +1,38 @@ -%global module_dir dcdbsync/ +%global module_dir dcdbsync -Name: puppet-dcdbsync -Version: 1.0 -Release: 1 -License: Apache-2.0 -Summary: Puppet dcdbsync module -Url: https://opendev.org/starlingx/config -Group: Development/Tools/Other -Source0: %{name}-%{version}.tar.gz +Name: puppet-%{module_dir} +Version: 1.0.0 +Release: stx +Summary: Puppet %{module_dir} module +License: Apache-2.0 +Group: Development/Tools/Other +URL: https://opendev.org/starlingx/config + +Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel + +BuildRequires: python2-devel %description -A puppet module for dcorch dbsync service +A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build +# +# The src for this puppet module needs to be staged to puppet/modules +# %install -install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir} -cp -R %{module_dir} %{buildroot}%{_datadir}/puppet/modules -ls +make install \ + MODULEDIR=%{buildroot}%{_datadir}/puppet/modules %files %defattr(-,root,root,-) -%{_datadir}/puppet/ -%{_datadir}/puppet/modules/ +%license LICENSE +%dir %{_datadir}/puppet +%dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} %changelog diff --git a/modules/puppet-dcmanager/opensuse/puppet-dcmanager.spec b/modules/puppet-dcmanager/opensuse/puppet-dcmanager.spec index 82734c80..9a4e086d 100644 --- a/modules/puppet-dcmanager/opensuse/puppet-dcmanager.spec +++ b/modules/puppet-dcmanager/opensuse/puppet-dcmanager.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-dcorch/opensuse/puppet-dcorch.spec b/modules/puppet-dcorch/opensuse/puppet-dcorch.spec index b57e9d46..b3e66495 100644 --- a/modules/puppet-dcorch/opensuse/puppet-dcorch.spec +++ b/modules/puppet-dcorch/opensuse/puppet-dcorch.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build diff --git a/modules/puppet-fm/opensuse/puppet-fm.spec b/modules/puppet-fm/opensuse/puppet-fm.spec index c4882836..2fcbbdc0 100644 --- a/modules/puppet-fm/opensuse/puppet-fm.spec +++ b/modules/puppet-fm/opensuse/puppet-fm.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-mtce/opensuse/puppet-mtce.spec b/modules/puppet-mtce/opensuse/puppet-mtce.spec index 2c5ca37d..d6ad2b7f 100644 --- a/modules/puppet-mtce/opensuse/puppet-mtce.spec +++ b/modules/puppet-mtce/opensuse/puppet-mtce.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-nfv/opensuse/puppet-nfv.spec b/modules/puppet-nfv/opensuse/puppet-nfv.spec index f435ac11..ea255dd6 100644 --- a/modules/puppet-nfv/opensuse/puppet-nfv.spec +++ b/modules/puppet-nfv/opensuse/puppet-nfv.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-patching/opensuse/puppet-patching.spec b/modules/puppet-patching/opensuse/puppet-patching.spec index 0e5c9230..a6034312 100644 --- a/modules/puppet-patching/opensuse/puppet-patching.spec +++ b/modules/puppet-patching/opensuse/puppet-patching.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-smapi/opensuse/puppet-smapi.spec b/modules/puppet-smapi/opensuse/puppet-smapi.spec index 051aa4a6..262c99dc 100644 --- a/modules/puppet-smapi/opensuse/puppet-smapi.spec +++ b/modules/puppet-smapi/opensuse/puppet-smapi.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-sshd/opensuse/puppet-sshd.spec b/modules/puppet-sshd/opensuse/puppet-sshd.spec index e9b4a5d9..21beecdb 100644 --- a/modules/puppet-sshd/opensuse/puppet-sshd.spec +++ b/modules/puppet-sshd/opensuse/puppet-sshd.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir} diff --git a/modules/puppet-sysinv/opensuse/puppet-sysinv.spec b/modules/puppet-sysinv/opensuse/puppet-sysinv.spec index e69edb18..390fe0c4 100644 --- a/modules/puppet-sysinv/opensuse/puppet-sysinv.spec +++ b/modules/puppet-sysinv/opensuse/puppet-sysinv.spec @@ -17,7 +17,7 @@ BuildRequires: python2-devel A puppet module for %{module_dir} %prep -%autosetup -q -n %{name}-%{version}/src +%autosetup -n %{name}-%{version}/src %build @@ -30,7 +30,7 @@ make install \ %files %defattr(-,root,root,-) -%license src/LICENSE +%license LICENSE %dir %{_datadir}/puppet %dir %{_datadir}/puppet/modules %{_datadir}/puppet/modules/%{module_dir}