From ce7afd32cad9ececbec33ea63da3aaa698ff35db Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 25 Mar 2024 18:56:26 -0500 Subject: [PATCH] Upgrade from 1.10.6 to 1.19.4 Signed-off-by: Jason Rothstein --- gitea.spec | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/gitea.spec b/gitea.spec index 7b445bb..dd3c4a0 100644 --- a/gitea.spec +++ b/gitea.spec @@ -4,15 +4,18 @@ ExclusiveArch: %{go_arches} %endif Name: gitea -Version: 1.10.6 -Release: 2%{?dist} +Version: 1.19.4 +Release: 0%{?dist} Summary: Gitea: Git with a cup of tea License: MIT URL: https://gitea.io/en-us/ Source0: https://github.com/go-gitea/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +BuildRequires: git BuildRequires: golang +BuildRequires: nodejs +BuildRequires: nodejs-npm BuildRequires: pam-devel Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/useradd @@ -22,26 +25,14 @@ Requires: git %prep -%setup -q -c +%setup -q -n %{name}-%{version} %build -%{__mkdir_p} src/code.gitea.io/ -%{__ln_s} ../../%{name}-%{version} src/code.gitea.io/gitea -export GOPATH=$(pwd):%{gopath} +sed -i -e 's/-s -w //g' Makefile -for bindir_location in options public templates -do - ( - cd src/code.gitea.io/gitea/modules/${bindir_location} - GO111MODULE=on go run -mod=vendor main.go - ) -done - -sed -i \ - -e 's/-s -w //g' %{name}-%{version}/Makefile +export LDFLAGS=`echo ${LDFLAGS} | sed -i -e 's/-Wl,-z,relro //g'` make \ - -C src/code.gitea.io/gitea/ \ TAGS="bindata pam sqlite sqlite_unlock_notify"\ DRONE_TAG="%{version}-%{release}" \ GOFLAGS='-a' \ @@ -53,7 +44,7 @@ sed -i \ -e 's|^WorkingDirectory=.*$|WorkingDirectory=/var/lib/gitea|g' \ -e 's|^ExecStart=.*$|ExecStart=%{_bindir}/gitea web /etc/gitea/app.ini|g' \ -e 's|^Environment=.*$|Environment=USER=gitea HOME=/var/lib/gitea GITEA_WORK_DIR=/var/lib/gitea|g' \ - %{name}-%{version}/contrib/systemd/gitea.service + contrib/systemd/gitea.service %install @@ -63,8 +54,8 @@ rm -rf %{buildroot} %{__install} -d %{buildroot}/usr/lib/systemd/system %{__install} -d %{buildroot}/var/lib/gitea %{__install} -d %{buildroot}/var/log/gitea -%{__install} -p -m 0755 %{name}-%{version}/%{name} %{buildroot}%{_bindir}/%{name} -%{__install} -p -m 0644 %{name}-%{version}/contrib/systemd/gitea.service %{buildroot}/usr/lib/systemd/system/gitea.service +%{__install} -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name} +%{__install} -p -m 0644 contrib/systemd/gitea.service %{buildroot}/usr/lib/systemd/system/gitea.service %pre @@ -81,13 +72,14 @@ then fi %files -%license src/code.gitea.io/gitea/LICENSE -%doc src/code.gitea.io/gitea/CHANGELOG.md -%doc src/code.gitea.io/gitea/CONTRIBUTING.md -%doc src/code.gitea.io/gitea/DCO -%doc src/code.gitea.io/gitea/MAINTAINERS -%doc src/code.gitea.io/gitea/README.md -%doc src/code.gitea.io/gitea/README_ZH.md +%license LICENSE +%doc CHANGELOG.md +%doc CONTRIBUTING.md +%doc DCO +%doc MAINTAINERS +%doc README.md +%doc README_ZH.md +%doc SECURITY.md %attr(0700, gitea, gitea) %dir /var/lib/gitea %attr(0700, gitea, gitea) %dir /var/log/gitea %{_bindir}/%{name} @@ -96,6 +88,12 @@ fi %changelog +* Sun Mar 24 2024 Jason Rothstein +- rebuild for Fedora 39 +- version bump to 1.19.4 +- add new nodejs, npm, git package dependency +- strip -Wl,-z,relro from LDFLAGS because that isn't compatible with Go + * Sat Mar 28 2020 Jason Rothstein - rebuild for Fedora 32