starlingx/fault
Code Issues Proposed changes

Merge "Adding %fdupes macro to python-fmclient and fm-rest-api in opensuse"

Browse Source
This commit is contained in:
Zuul 2019-10-08 13:43:05 +00:00 committed by Gerrit Code Review
commit fb8dc46a59
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fm-rest-api/opensuse/fm-rest-api.spec
View File

@ -7,6 +7,7 @@ Group: Development/Tools/Other
URL: https://opendev.org/starlingx/fault URL: https://opendev.org/starlingx/fault
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: insserv-compat BuildRequires: insserv-compat
BuildRequires: fdupes
BuildRequires: python-oslo.db BuildRequires: python-oslo.db
BuildRequires: python-oslo.messaging BuildRequires: python-oslo.messaging
BuildRequires: python-oslo.middleware BuildRequires: python-oslo.middleware
@ -69,6 +70,8 @@ install -m 640 fm/db/sqlalchemy/migrate_repo/migrate.cfg %{buildroot}%{pythonroo
oslo-config-generator --config-file fm/config-generator.conf --output-file %{_builddir}/fm.conf.sample oslo-config-generator --config-file fm/config-generator.conf --output-file %{_builddir}/fm.conf.sample
install -p -D -m 644 %{_builddir}/fm.conf.sample %{buildroot}%{_sysconfdir}/fm/fm.conf install -p -D -m 644 %{_builddir}/fm.conf.sample %{buildroot}%{_sysconfdir}/fm/fm.conf
%fdupes %{buildroot}%{pythonroot}/fm
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE %license LICENSE

5
python-fmclient/opensuse/python-fmclient.spec
View File

@ -13,6 +13,7 @@ License: Apache-2.0
Group: Development/Tools/Other Group: Development/Tools/Other
URL: https://opendev.org/starlingx/fault URL: https://opendev.org/starlingx/fault
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: fdupes
BuildRequires: git BuildRequires: git
BuildRequires: python-setuptools BuildRequires: python-setuptools
BuildRequires: python2-pbr BuildRequires: python2-pbr
@ -53,6 +54,10 @@ python setup.py install --root=%{buildroot} \
install -d -m 755 %{buildroot}%{local_etc_bash_completiond} install -d -m 755 %{buildroot}%{local_etc_bash_completiond}
install -p -D -m 664 tools/fm.bash_completion %{buildroot}%{local_etc_bash_completiond}/fm.bash_completion install -p -D -m 664 tools/fm.bash_completion %{buildroot}%{local_etc_bash_completiond}/fm.bash_completion
%fdupes %{buildroot}%{pythonroot}/fmclient
%fdupes %{buildroot}%{pythonroot}/%{pypi_name}-%{version}*.egg-info
%files %files
%license LICENSE %license LICENSE
%{_bindir}/* %{_bindir}/*