diff --git a/gitea.spec b/gitea.spec index 648823c..87b9be7 100644 --- a/gitea.spec +++ b/gitea.spec @@ -2,7 +2,7 @@ ExclusiveArch: %{go_arches} Name: gitea Version: 1.8.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Gitea: Git with a cup of tea License: MIT @@ -74,7 +74,7 @@ sed -i -e 's/^var Version.*$/var Version = "%{version}-%{release}"/g' main.go # # Using -v to display what is happening # -go build -a -v -tags 'bindata pam sqlite sqlite_unlock_notify' +go build -a -v -tags 'pam sqlite sqlite_unlock_notify' sed -i \ -e 's|^User=.*$|User=gitea|g' \ -e 's|^Group=.*$|Group=gitea|g' \ @@ -94,9 +94,9 @@ cd src/code.gitea.io/gitea %{__install} -d %{buildroot}/var/log/gitea %{__install} -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name} %{__install} -p -m 0644 contrib/systemd/gitea.service %{buildroot}/usr/lib/systemd/system/gitea.service -# %{__cp} -rp options %{buildroot}/var/lib/gitea/ -# %{__cp} -rp public %{buildroot}/var/lib/gitea/ -# %{__cp} -rp templates %{buildroot}/var/lib/gitea/ +%{__cp} -rp options %{buildroot}/var/lib/gitea/ +%{__cp} -rp public %{buildroot}/var/lib/gitea/ +%{__cp} -rp templates %{buildroot}/var/lib/gitea/ %pre @@ -116,14 +116,17 @@ getent passwd gitea > /dev/null 2>&1 || useradd -r -d /var/lib/gitea -s /bin/bas %{_bindir}/%{name} %attr(0644, root, root) /usr/lib/systemd/system/gitea.service %attr(-, gitea, gitea) %config(noreplace) %{_sysconfdir}/gitea -# %attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/options -# %attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/public -# %attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/templates +%attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/options +%attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/public +%attr(-, gitea, gitea) %config(noreplace) /var/lib/gitea/templates %changelog * Sun Jul 28 2019 Jason Rothstein -* Use the bindata tag to bundle everything internally +- And not use it now because it triggers build failures + +* Sun Jul 28 2019 Jason Rothstein +- Use the bindata tag to bundle everything internally * Sun Jul 28 2019 Jason Rothstein - Put options into /var/lib/gitea so the locale data is available