Skip to content

Commit a1d8ea1

Browse files
author
Chris Johnson
committed
Fixes dependency issues on simengine, a few tweaks to python SPECs.
1 parent 6fd48d7 commit a1d8ea1

6 files changed

Lines changed: 9 additions & 197 deletions

File tree

rpm/specfiles/python2-redis.spec

Lines changed: 0 additions & 62 deletions
This file was deleted.

rpm/specfiles/python2-snmpsim.spec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,16 @@ exit 0
5757

5858
%files -n python2-%{pypi_name}
5959
%license docs/source/license.rst LICENSE.txt
60-
%doc data/README.txt data/foreignformats/README.txt data/variation/README.txt data/variation/multiplex/README.txt data/public/README-v2c.txt data/public/1.3.6.1.2.1.100.1.2.0/README-v2c.txt data/public/1.3.6.1.2.1.100.1.2.0/README-v3.txt data/public/README-v3.txt data/public/1.3.6.1.6.1.1.0/README-v2c.txt data/public/1.3.6.1.6.1.1.0/README-v3.txt data/1.3.6.1.6.1.1.0/README-v2c.txt data/1.3.6.1.6.1.1.0/README-v3.txt README.md
60+
#%doc data/README.txt data/foreignformats/README.txt data/variation/README.txt data/variation/multiplex/README.txt data/public/README-v2c.txt data/public/1.3.6.1.2.1.100.1.2.0/README-v2c.txt data/public/1.3.6.1.2.1.100.1.2.0/README-v3.txt data/public/README-v3.txt data/public/1.3.6.1.6.1.1.0/README-v2c.txt data/public/1.3.6.1.6.1.1.0/README-v3.txt data/1.3.6.1.6.1.1.0/README-v2c.txt data/1.3.6.1.6.1.1.0/README-v3.txt README.md
6161
%{_bindir}/datafile.py
6262
%{_bindir}/mib2dev.py
6363
%{_bindir}/pcap2dev.py
6464
%{_bindir}/snmprec.py
6565
%{_bindir}/snmpsimd.py
6666
%{python2_sitelib}/%{pypi_name}
6767
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
68+
/usr/snmpsim/data
69+
/usr/snmpsim/variation
6870

6971
%files -n python-%{pypi_name}-doc
7072
%doc html

rpm/specfiles/python3-circuits.spec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ rm -rf %{pypi_name}.egg-info
4343

4444
%install
4545
%py3_install
46-
#exit 0
4746

4847
#%check
4948
#%{__python3} setup.py test
@@ -53,10 +52,10 @@ rm -rf %{pypi_name}.egg-info
5352
%doc README.rst
5453
%{_bindir}/circuits.bench
5554
%{_bindir}/circuits.web
56-
%{_bindir}/htpasswd
55+
%config%{_bindir}/htpasswd
5756
%{python3_sitelib}/%{pypi_name}
5857
%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
5958

6059
%changelog
6160
* Fri Aug 17 2018 Chris Johnson <christopher.johnson@senecacollege.ca> - 3.2-1
62-
- Initial package.
61+
- Initial package.

rpm/specfiles/python3-pysnmp.spec

Lines changed: 0 additions & 67 deletions
This file was deleted.

rpm/specfiles/python3-redis.spec

Lines changed: 0 additions & 62 deletions
This file was deleted.

rpm/specfiles/simengine-core.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ License: GPLv3+
88
Source0: %{name}-%{version}.tar.gz
99

1010
BuildRequires: OpenIPMI-devel, gcc
11-
#Requires: simengine-database, python-pysnmp, python-circuits, python-snmpsim, python3-libvirt
12-
Requires: simengine-database, python3-libvirt, OpenIPMI, OpenIPMI-lanserv
11+
Requires: simengine-database, python3-libvirt, OpenIPMI, OpenIPMI-lanserv, python3-redis, python2-redis, python3-pysnmp, python3-neo4j-driver
1312

1413
%description
1514
Core files for SimEngine.
1615

1716
%global debug_package %{nil}
1817

18+
%pre
19+
pip3 install circuits
20+
1921
%prep
2022
%autosetup -c %{name}
2123

0 commit comments

Comments
 (0)