--- rpms/smeserver-gitweb/contribs9/smeserver-gitweb.spec 2016/02/17 00:27:19 1.3 +++ rpms/smeserver-gitweb/contribs9/smeserver-gitweb.spec 2016/06/10 14:38:30 1.7 @@ -1,6 +1,6 @@ %define name smeserver-gitweb %define version 1.1.0 -%define release 2 +%define release 5 Summary: GitWeb is a web based Git repository viewer on SME Server Name: %{name} Version: %{version} @@ -21,11 +21,26 @@ Requires: highlight AutoReqProv: no Patch1: smeserver-gitweb-1.1.0-remove_unused_linefeed_from_auth_error.patch Patch2: smeserver-gitweb-1.1.0-remove_runtime_access_to_networks_db.patch +Patch3: smeserver-gitweb-1.1.0-runtime_search_for_pwauth.patch +Patch4: smeserver-gitweb-1.1.0-defineURI.patch + %description HTTP access to https://git.host.com provides a gitweb view of the repositories. %changelog +* Fri Jun 10 2016 Jean-Philipe Pialasse 1.1.0-5.sme +- fix short url to repo not working [SME: 9202] + +* Thu Feb 18 2016 Marco Hess 1.1.0-4 +- Removed chmod 644 /home/e-smith/db/networks from spec file as + it is no longer required for gitweb.conf + +* Wed Feb 17 2016 Marco Hess 1.1.0-3 +- Changed the trypass function in 60ExportAuthHook to dynamically + check for the location of pwauth so this becomes universal for + SME8 and SME9. + * Wed Feb 17 2016 Marco Hess 1.1.0-2 - Remove runtime access to NetworkDB [SME: 9217] - Some trailing whitespace cleanup @@ -55,6 +70,9 @@ HTTP access to https://git.host.com prov %setup %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 + %build %install @@ -70,8 +88,6 @@ rm -rf $RPM_BUILD_ROOT echo "Ensuring git database is accessible to GitWeb ..." touch /home/e-smith/db/git chmod 644 /home/e-smith/db/git -echo "Ensuring networks database is accessible to GitWeb ..." -chmod 644 /home/e-smith/db/networks echo "Expanding gitweb.conf template ..." /sbin/e-smith/expand-template /etc/gitweb.conf echo "Expanding GitWeb home page text template ..."