Merge branch 'master' of ssh://dev.daniel-steiner.org/srv/gitea/public/rpms

This commit is contained in:
2019-11-25 16:16:55 +01:00
2 changed files with 32 additions and 4 deletions

View File

@@ -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
@@ -93,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)
@@ -288,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 \
@@ -298,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}
@@ -505,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)
@@ -597,6 +611,9 @@ rm -rf %{buildroot}
# nothing
%changelog
* Fri Nov 22 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Initial version 2.24.0
* Mon Jun 3 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Initial version 2.21.0

View File

@@ -1,5 +1,5 @@
Name: gitea
Version: 1.9.3
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,12 @@ getent passwd gitea > /dev/null || \
%changelog
* Fri Nov 22 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to version 1.10.0.
* Fri Oct 18 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to version 1.9.4.
* Sat Sep 21 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to version 1.9.3.