Updata of gitea, dependency fixed in polemarch

fedora/SPECS/gitea.spec

@@ -1,5 +1,5 @@
 Name:           gitea
-Version:        1.10.4
+Version:        1.11.5
 Release:        1%{?dist}
 Summary:        Gitea is a painless self-hosted Git service.
 %define	MyVersion %version
@@ -7,7 +7,6 @@ Summary:        Gitea is a painless self-hosted Git service.
 
 License:        MIT
 URL:            https://gitea.io
-#Source0:        https://github.com/go-gitea/gitea/archive/%{version}.tar.gz
 Source0:        %name-%MyVersion.tar.gz
 Source1:	      gitea.service
 
@@ -17,6 +16,7 @@ BuildRequires:	golang >= 1.8
 BuildRequires:	go-bindata
 %endif
 BuildRequires:	make
+BuildRequires:  npm
 
 Requires: git
 
@@ -82,8 +82,18 @@ getent passwd gitea > /dev/null || \
 
 
 %changelog
-* Sat May 2 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+* Fri May 15 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
-- Update to version 1.10.4.
+- Update to version 1.11.5.
+
+* Fri Mar 27 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+* Fri Apr 10 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Update to version 1.11.4.
+
+* Fri Mar 27 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Update to version 1.11.3.
+
+* Sat Feb 22 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Update to version 1.11.1.
 
 * Sat Jan 25 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to version 1.10.3.

fedora/SPECS/polemarch.spec

@@ -10,13 +10,14 @@
 %global __arch_install_post   /usr/lib/rpm/check-buildroot
 
 # Macros
+%define pyversion 3.8
 %define name polemarch
 %define shortname polemarch
 %define namebase polemarch
 %define user polemarch
 %define datad poledata
 %define version 1.6.2
-%define release 1
+%define release 2
 %define __prelink_undo_cmd %{nil}
 %define _binaries_in_noarch_packages_terminate_build   0
 %define unmangled_version %{version}
@@ -34,6 +35,8 @@ Source0:  %name-%version.tar.gz
 Source1:  %name-settings
 Source2:  %name-redis-patch.sh
 Source3:  %name-mysql-patch.sh
+# compiled binary tree:
+Source10: %name-bin-%{version}.tgz
 Patch0:   %name-python3.patch
 Patch1:   %name-venvctrl.patch
 
@@ -48,6 +51,7 @@ Requires: libyaml-devel
 Requires: krb5-devel, krb5-libs, openldap-devel
 Requires: mailcap
 Requires: python3-redis >= 3.2.0, python3-django-redis >= 4.0.0, redis >= 5.0.0
+Requires: python3-gitdb, python3-GitPython
 
 %description
 Polemarch is service for orchestration infrastructure by ansible.
@@ -56,10 +60,15 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks.
 %prep
 %setup -q -n %name-%version
 #patch0 -b python3-patch
+%patch1 -b venvctrl-patch
 
 %install
-make BUILD_DIR=%{buildroot}
+#/usr/bin/make BUILD_DIR=%{buildroot}
-install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini
+# Install binary package (compiling does not work here! You need to compile it first!)
+# /usr/bin/make BUILD_DIR=/root/rpmbuild/BUILDROOT/polemarch-1.6.2-1.fc32.x86_64
+# don't forget to replace version and release number!
+tar xzf %{S:10} -C %{buildroot}
+/usr/bin/install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini
 # fix for python3 redis access:
 bash %{S:2}
 # fix or workaround for mysqlclient version check:
@@ -69,8 +78,13 @@ mv %{buildroot}/var/run %{buildroot}/
 # create additional directories:
 install -d %{buildroot}/%{_var}/log/%{name}
 install -d %{buildroot}/opt/%{datad}
-ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb
+ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/MySQLdb
-ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python3.7/site-packages/pymysql
+ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/pymysql
+# remove compiled git python package, which are not working on Fedora 32 and pyton3.8
+rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git
+ln -s %{python3_sitelib}/git %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git
+rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb
+ln -s %{python3_sitelib}/gitdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb
 # remove buildroot path in opt/polemarch/bin/activate.xsh:
 sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh
 
@@ -114,6 +128,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
+* Sun May 3 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked.
+
 * Fri Jan 17 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.6.2 version.