Nginx and Polemarch updated
This commit is contained in:
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.16.0
|
Version: 1.17.0
|
||||||
Release: 99.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
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@@ -530,6 +530,9 @@ fi
|
|||||||
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jun 16 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.17.0-1
|
||||||
|
- Updated to mainline version 1.17.x.
|
||||||
|
|
||||||
* Fri May 17 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.16.0-99.1
|
* Fri May 17 2019 Daniel Steiner <daniel.steiner@greenmail.ch> 1.16.0-99.1
|
||||||
- Release version increased to 99, but, subrelease version added.
|
- Release version increased to 99, but, subrelease version added.
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
# prevents the building of /usr/lib/.build-id directories and files:
|
# prevents the building of /usr/lib/.build-id directories and files:
|
||||||
# this only happens, if you are using python virtualenv
|
# this only happens, if you are using python virtualenv
|
||||||
%global _build_id_links none
|
%global _build_id_links none
|
||||||
|
# don't check for rpath:
|
||||||
|
%global __arch_install_post /usr/lib/rpm/check-buildroot
|
||||||
|
|
||||||
# Macros
|
# Macros
|
||||||
%define name polemarch
|
%define name polemarch
|
||||||
@@ -13,8 +15,8 @@
|
|||||||
%define namebase polemarch
|
%define namebase polemarch
|
||||||
%define user polemarch
|
%define user polemarch
|
||||||
%define datad poledata
|
%define datad poledata
|
||||||
%define version 1.1.4
|
%define version 1.2.1
|
||||||
%define release 2
|
%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
|
||||||
%define unmangled_version %{version}
|
%define unmangled_version %{version}
|
||||||
@@ -37,7 +39,7 @@ Patch1: %name-venvctrl.patch
|
|||||||
|
|
||||||
# Note: these two packages must not be installed by distribution (fedora): python3-pyyaml, python3-blockdiag-devel
|
# Note: these two packages must not be installed by distribution (fedora): python3-pyyaml, python3-blockdiag-devel
|
||||||
# Build fails, if these two packages are installed!
|
# Build fails, if these two packages are installed!
|
||||||
BuildRequires: python3, openssl-devel, libyaml-devel
|
BuildRequires: python3, openssl-devel, libyaml-devel, python3-mysql
|
||||||
BuildRequires: python3-sphinxcontrib-blockdiag, python3-virtualenv, openldap-devel
|
BuildRequires: python3-sphinxcontrib-blockdiag, python3-virtualenv, openldap-devel
|
||||||
Requires: python3, openssl-devel, libxcrypt-compat
|
Requires: python3, openssl-devel, libxcrypt-compat
|
||||||
Requires: python3-virtualenv, python3-mysql, python3-PyMySQL
|
Requires: python3-virtualenv, python3-mysql, python3-PyMySQL
|
||||||
@@ -70,6 +72,7 @@ mv %{buildroot}/var/run %{buildroot}/
|
|||||||
# create additional directories:
|
# create additional directories:
|
||||||
install -d %{buildroot}/%{_var}/log/%{name}
|
install -d %{buildroot}/%{_var}/log/%{name}
|
||||||
install -d %{buildroot}/opt/%{datad}
|
install -d %{buildroot}/opt/%{datad}
|
||||||
|
ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
getent group %{user} >/dev/null || \
|
getent group %{user} >/dev/null || \
|
||||||
@@ -111,6 +114,12 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
|
|||||||
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
|
- Update to 1.2.1 version.
|
||||||
|
|
||||||
|
* Mon Jun 10 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
|
- Update to 1.2.0 version, python 3 is required now.
|
||||||
|
|
||||||
* Sun May 12 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
* Sun May 12 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
- Dependency for libxcrypt-compat added.
|
- Dependency for libxcrypt-compat added.
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
%define debug_package %nil
|
%define debug_package %nil
|
||||||
%define oname XnView
|
%define oname XnView
|
||||||
%global DONT_REMOVE_RPATH 1
|
%global DONT_REMOVE_RPATH 1
|
||||||
|
# don't check for rpath:
|
||||||
|
%global __arch_install_post /usr/lib/rpm/check-buildroot
|
||||||
|
|
||||||
Name: xnview
|
Name: xnview
|
||||||
Version: 0.93.1
|
Version: 0.93.1
|
||||||
|
|||||||
Reference in New Issue
Block a user