Merge branch 'PurpleI2P:openssl' into ui

This commit is contained in:
dr|z3d 2021-08-24 08:28:36 +00:00 committed by GitHub
commit b7f2dd9074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 38 deletions

View file

@ -1,7 +1,7 @@
%define git_hash %(git rev-parse HEAD | cut -c -7)
Name: i2pd-git
Version: 2.38.0
Version: 2.39.0
Release: git%{git_hash}%{?dist}
Summary: I2P router written in C++
Conflicts: i2pd
@ -57,7 +57,7 @@ cd build
%endif
%if 0%{?fedora} >= 36
%if 0%{?fedora} >= 35
pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
@ -82,7 +82,7 @@ popd
%install
pushd build
%if 0%{?fedora} >= 36
%if 0%{?fedora} >= 35
pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
@ -146,6 +146,13 @@ getent passwd i2pd >/dev/null || \
%changelog
* Mon Aug 24 2021 r4sas <r4sas@i2pmail.org> - 2.39.0-2
- changed if statements to cover fedora 35
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
- update to 2.39.0
- fixed build on fedora 36
* Mon May 17 2021 orignal <i2porignal@yandex.ru> - 2.38.0
- update to 2.38.0

View file

@ -1,6 +1,6 @@
Name: i2pd
Version: 2.38.0
Release: 1%{?dist}
Version: 2.39.0
Release: 2%{?dist}
Summary: I2P router written in C++
Conflicts: i2pd-git
@ -54,7 +54,7 @@ cd build
%endif
%endif
%if 0%{?fedora} >= 36
%if 0%{?fedora} >= 35
pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
@ -79,7 +79,7 @@ popd
%install
pushd build
%if 0%{?fedora} >= 36
%if 0%{?fedora} >= 35
pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
@ -143,6 +143,13 @@ getent passwd i2pd >/dev/null || \
%changelog
* Mon Aug 24 2021 r4sas <r4sas@i2pmail.org> - 2.39.0-2
- changed if statements to cover fedora 35
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
- update to 2.39.0
- fixed build on fedora 36
* Mon May 17 2021 orignal <i2porignal@yandex.ru> - 2.38.0
- update to 2.38.0