Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a26019507 | ||
|
|
73f1cf7bde | ||
|
|
a9325eb529 | ||
|
|
d38fa62959 |
2 changed files with 14 additions and 18 deletions
|
|
@ -1,19 +1,12 @@
|
|||
On RHEL7 the python3 binary is actually naed python3.4.
|
||||
The usual python3 is not available there.
|
||||
Searching explicitly for python3.4 amongst the others will fix the issue.
|
||||
|
||||
Merged to upstream with 0.7.0
|
||||
|
||||
https://github.com/DinoTools/dionaea/pull/180
|
||||
diff -ru dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/configure.ac dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/configure.ac
|
||||
--- dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/configure.ac 2018-03-26 21:49:11.042568472 +0200
|
||||
+++ dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/configure.ac 2018-03-26 21:49:29.854553159 +0200
|
||||
@@ -580,7 +580,7 @@
|
||||
diff -up dionaea-0.7.0/configure.ac.python36 dionaea-0.7.0/configure.ac
|
||||
--- dionaea-0.7.0/configure.ac.python36 2018-05-01 23:22:13.000000000 +0300
|
||||
+++ dionaea-0.7.0/configure.ac 2019-04-01 16:39:46.689072376 +0300
|
||||
@@ -580,7 +580,7 @@ AC_ARG_WITH(cython-dir,
|
||||
[cython_dir="$withval"],[cython_dir=$PATH])
|
||||
|
||||
if test x$enable_cython = "xyes" ; then
|
||||
- AC_PATH_PROGS(CYTHON_BIN, [cython3 cython], "no", $cython_dir)
|
||||
+ AC_PATH_PROGS(CYTHON_BIN, [cython3.4 cython3 cython], "no", $cython_dir)
|
||||
- AC_PATH_PROGS(CYTHON_BIN, [cython3.4 cython3 cython], "no", $cython_dir)
|
||||
+ AC_PATH_PROGS(CYTHON_BIN, [cython3.6 cython3 cython], "no", $cython_dir)
|
||||
if test "x$CYTHON_BIN" == "xno" ; then
|
||||
enable_cython="no"
|
||||
fi
|
||||
|
|
|
|||
13
dionaea.spec
13
dionaea.spec
|
|
@ -48,11 +48,11 @@ URL: https://dionaea.readthedocs.io/
|
|||
|
||||
|
||||
%if 0%{?build_release} > 0
|
||||
Release: %{rel}%{?dist}
|
||||
Release: %{rel}%{?dist}.1
|
||||
Source0: https://github.com/%{gituser}/%{gitname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
%else
|
||||
# not using 0. on the beginning of release as this git snapshot is past the 0.6.0 release
|
||||
Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}
|
||||
Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1
|
||||
Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
|
||||
%endif #build_release
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ Patch6: dionaea-06_docswarn.patch
|
|||
# Fix configure not finding the cython on RHEL7/Centos7
|
||||
# https://github.com/DinoTools/dionaea/pull/180
|
||||
# Merged to upstream with 0.7.0
|
||||
# Patch7: dionaea-07_cython_el7.patch
|
||||
Patch7: dionaea-07_cython_el7.patch
|
||||
|
||||
# Fix hardcoded lib dir
|
||||
# https://github.com/DinoTools/dionaea/pull/181
|
||||
|
|
@ -239,8 +239,8 @@ rm -rf .git
|
|||
# Remove the .gitignore to prevent ignoring changes in some files
|
||||
rm -f .gitignore
|
||||
git init -q
|
||||
git config --global user.email "rpmbuild"
|
||||
git config --global user.name "rpmbuild"
|
||||
git config user.email "rpmbuild"
|
||||
git config user.name "rpmbuild"
|
||||
git add .
|
||||
git commit -a -m "base"
|
||||
|
||||
|
|
@ -481,6 +481,9 @@ getent passwd dionaea >/dev/null || \
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 02 2019 Troy Dawson <tdawson@redhat.com> - 0.7.0-1.1
|
||||
- Rebuilt to change main python from 3.4 to 3.6
|
||||
|
||||
* Thu May 10 2018 Michal Ambroz <rebus at, seznam.cz> 0.7.0-1
|
||||
- bump to release 0.7.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue