public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

old change

Browse Source
This commit is contained in:
dani
2019-07-27 16:03:01 +02:00
parent 61d23187e8 ebbf0ac45f
commit 499e9ef058
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fedora/SPECS/nginx.spec
View File

@@ -17,7 +17,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.17.0 Version: 1.17.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
@@ -530,6 +530,9 @@ fi
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%changelog %changelog
* Sat Jul 13 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1
- Updated to mainline version 1.17.1.
* Sun Jun 16 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1 * Sun Jun 16 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1
- Updated to mainline version 1.17.x. - Updated to mainline version 1.17.x.

12
fedora/SPECS/polemarch.spec
View File

@@ -15,7 +15,11 @@
%define namebase polemarch %define namebase polemarch
%define user polemarch %define user polemarch
%define datad poledata %define datad poledata
<<<<<<< HEAD
%define version 1.2.2 %define version 1.2.2
=======
%define version 1.3.1
>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
%define release 1 %define release 1
%define __prelink_undo_cmd %{nil} %define __prelink_undo_cmd %{nil}
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
@@ -56,9 +60,6 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks.
%prep %prep
%setup -q -n %name-%version %setup -q -n %name-%version
%patch0 -b python3-patch %patch0 -b python3-patch
#%if 0%{?fedora} > 29
#%patch1 -b venvctrl-patch
#%endif
%install %install
make BUILD_DIR=%{buildroot} make BUILD_DIR=%{buildroot}
@@ -114,8 +115,13 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%changelog %changelog
<<<<<<< HEAD
* Thu Jun 20 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Thu Jun 20 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.2.2 version. - Update to 1.2.2 version.
=======
* Sat Jul 13 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.3.1 version.
>>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
* Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.2.1 version. - Update to 1.2.1 version.