starlingx/stx-puppet
Code Issues Proposed changes

openSUSE specfiles fix-up

Browse Source 
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 <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2019-09-24 13:11:19 -07:00
parent 8c92b3ca66
commit 35f721cd5e
10 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/puppet-dcdbsync/opensuse/puppet-dcdbsync.spec
View File

@ -1,33 +1,38 @@
%global module_dir dcdbsync/ %global module_dir dcdbsync
Name: puppet-dcdbsync Name: puppet-%{module_dir}
Version: 1.0 Version: 1.0.0
Release: 1 Release: stx
License: Apache-2.0 Summary: Puppet %{module_dir} module
Summary: Puppet dcdbsync module License: Apache-2.0
Url: https://opendev.org/starlingx/config Group: Development/Tools/Other
Group: Development/Tools/Other URL: https://opendev.org/starlingx/config
Source0: %{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python2-devel
%description %description
A puppet module for dcorch dbsync service A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install %install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir} make install \
cp -R %{module_dir} %{buildroot}%{_datadir}/puppet/modules MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
ls
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/puppet/ %license LICENSE
%{_datadir}/puppet/modules/ %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}
%changelog %changelog

4
modules/puppet-dcmanager/opensuse/puppet-dcmanager.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

2
modules/puppet-dcorch/opensuse/puppet-dcorch.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build

4
modules/puppet-fm/opensuse/puppet-fm.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-mtce/opensuse/puppet-mtce.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-nfv/opensuse/puppet-nfv.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-patching/opensuse/puppet-patching.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-smapi/opensuse/puppet-smapi.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-sshd/opensuse/puppet-sshd.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}

4
modules/puppet-sysinv/opensuse/puppet-sysinv.spec
View File

@ -17,7 +17,7 @@ BuildRequires: python2-devel
A puppet module for %{module_dir} A puppet module for %{module_dir}
%prep %prep
%autosetup -q -n %{name}-%{version}/src %autosetup -n %{name}-%{version}/src
%build %build
@ -30,7 +30,7 @@ make install \
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license src/LICENSE %license LICENSE
%dir %{_datadir}/puppet %dir %{_datadir}/puppet
%dir %{_datadir}/puppet/modules %dir %{_datadir}/puppet/modules
%{_datadir}/puppet/modules/%{module_dir} %{_datadir}/puppet/modules/%{module_dir}