From 557a98c73bd4727c95713dde7fe2182d507f0175 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 22 Nov 2019 09:17:46 +0100 Subject: [PATCH 1/4] Merged --- centos/SPECS/gitea.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/centos/SPECS/gitea.spec b/centos/SPECS/gitea.spec index 31fc1f9..36cbd6a 100644 --- a/centos/SPECS/gitea.spec +++ b/centos/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -77,6 +77,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Oct 18 2019 Daniel Steiner +- Update to version 1.9.4. + * Sat Sep 21 2019 Daniel Steiner - Update to version 1.9.3. From c2e759dedd3e87575a4584874e777b0b853c5126 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 22 Nov 2019 09:34:06 +0100 Subject: [PATCH 2/4] Update to 1.10.0, handling for pathfix.py binary added --- centos/SPECS/gitea.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/centos/SPECS/gitea.spec b/centos/SPECS/gitea.spec index 36cbd6a..2526ee6 100644 --- a/centos/SPECS/gitea.spec +++ b/centos/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.9.4 +Version: 1.10.0 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -19,7 +19,10 @@ BuildRequires: go-bindata BuildRequires: make Requires: git -BuildRequires: /usr/bin/pathfix.py + +%if 0%{?rhel} >= 8 +BuildRequires: platform-python-devel +%endif # Temporary solution while waiting for golang and go-bindata to be built in cbs.centos.org ExclusiveArch: i686 x86_64 @@ -30,12 +33,14 @@ Gitea is a painless self-hosted Git service, built in GO %prep %setup -q -n %name-%MyVersion +%if 0%{?rhel} >= 8 for f in \ vendor/github.com/urfave/cli/runtests \ vendor/github.com/urfave/cli/generate-flag-types \ vendor/github.com/prometheus/procfs/ttar; do pathfix.py -pni /usr/bin/python3 $f done +%endif %build cd ../ @@ -77,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Nov 22 2019 Daniel Steiner +- Update to version 1.10.0. + * Fri Oct 18 2019 Daniel Steiner - Update to version 1.9.4. From 5116700d3820c00bd4313575acaef1ddf1208fff Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 22 Nov 2019 09:51:05 +0100 Subject: [PATCH 3/4] Update to latest version --- centos/SPECS/git.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/centos/SPECS/git.spec b/centos/SPECS/git.spec index e011a31..209bbd4 100644 --- a/centos/SPECS/git.spec +++ b/centos/SPECS/git.spec @@ -46,14 +46,20 @@ %global with_desktop_vendor_tag 0 %endif +# dont' forget to downlaod manpages: +# cdp +# v=2.24.0; f=git-htmldocs; s=xz; wget https://www.kernel.org/pub/software/scm/git/$f-$v.tar.$s -O SOURCES/$f-$v.tar.$s +# v=2.24.0; f=git-manpages; s=xz; wget https://www.kernel.org/pub/software/scm/git/$f-$v.tar.$s -O SOURCES/$f-$v.tar.$s +# v=2.24.0; f=git; s=xz; wget https://www.kernel.org/pub/software/scm/git/$f-$v.tar.$s -O SOURCES/$f-$v.tar.$s + Name: git -Version: 2.23.0 +Version: 2.24.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz +Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.xz Source2: git-init.el Source3: git.xinetd.in Source4: git.conf.httpd @@ -597,6 +603,9 @@ rm -rf %{buildroot} # nothing %changelog +* Fri Nov 22 2019 Daniel Steiner +- Initial version 2.24.0 + * Mon Jun 3 2019 Daniel Steiner - Initial version 2.21.0 From 893186b6a3d93139a0c330f47bb7b5baf0f96a57 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 22 Nov 2019 10:31:15 +0100 Subject: [PATCH 4/4] Build is now possible on CentOS 7 and 8 --- centos/SPECS/git.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/centos/SPECS/git.spec b/centos/SPECS/git.spec index 209bbd4..926464d 100644 --- a/centos/SPECS/git.spec +++ b/centos/SPECS/git.spec @@ -99,7 +99,9 @@ BuildRequires: zlib-devel >= 1.2 BuildRequires: systemd %endif +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: platform-python-devel +%endif Requires: less Requires: openssh-clients Requires: perl(Error) @@ -294,6 +296,7 @@ Perl interface to Git. %patch1 -p1 # Fix pyton path for python 3.6: +%if 0%{?fedora} || 0%{?rhel} >= 8 for f in \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ @@ -304,6 +307,7 @@ Documentation/RelNotes/1.7.0.5.txt \ git-instaweb.sh git-p4.py; do pathfix.py -pni /usr/bin/python3 $f done +%endif %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -511,7 +515,11 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d +%if 0%{?fedora} || 0%{?rhel} >= 8 %{_pkgdocdir}-%{version}/* +%else +%{_pkgdocdir}/* +%endif %files bzr %defattr(-,root,root)