Skip to content

Commit

Permalink
Merge pull request #118 from r0h4n/master
Browse files Browse the repository at this point in the history
- Update tendrl-node-agent.spec, remove logging and config directives
  • Loading branch information
r0h4n committed Jan 17, 2017
2 parents a185b38 + 76682bf commit 6048e1a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 46 deletions.
35 changes: 0 additions & 35 deletions etc/samples/tendrl_job.sample.json

This file was deleted.

13 changes: 2 additions & 11 deletions tendrl-commons.spec
Expand Up @@ -2,7 +2,7 @@ Name: tendrl-commons
Version: 1.1
Release: 2%{?dist}
BuildArch: noarch
Summary: Common module for Tendrl bridges and node_agent
Summary: Common lib for Tendrl sds integrations and node-agent
Source0: %{name}-%{version}.tar.gz
License: LGPLv2+
URL: https://github.com/Tendrl/commons
Expand All @@ -26,7 +26,7 @@ Requires: python-docutils
Requires: python-yaml

%description
Common python module usable by all Tendrl SDS Bridges
Common lib for Tendrl sds integrations and node-agent

%prep
%setup
Expand All @@ -39,23 +39,14 @@ rm -rf %{name}.egg-info

%install
%{__python} setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
install -m 0755 --directory $RPM_BUILD_ROOT%{_var}/log/tendrl/commons
install -Dm 644 etc/tendrl/tendrl.conf.sample $RPM_BUILD_ROOT%{_datadir}/tendrl/commons/tendrl.conf.sample
install -Dm 644 etc/samples/logging.yaml.timedrotation.sample $RPM_BUILD_ROOT%{_sysconfdir}/tendrl/commons_logging.yaml
install -Dm 644 etc/samples/*.sample $RPM_BUILD_ROOT%{_datadir}/tendrl/commons/.

%check
py.test -v tendrl/commons/tests || :

%files -f INSTALLED_FILES
%dir %{_var}/log/tendrl/commons
%dir %{_datadir}/tendrl/commons
%dir %{_sysconfdir}/tendrl
%doc README.rst
%license LICENSE
%{_datadir}/tendrl/commons/
%{_datarootdir}/tendrl/commons/tendrl.conf.sample
%config(noreplace) %{_sysconfdir}/tendrl/commons_logging.yaml

%changelog
* Tue Dec 06 2016 Martin Bukatovič <mbukatov@redhat.com> - 0.0.1-2
Expand Down

0 comments on commit 6048e1a

Please sign in to comment.