--- rpms/smeserver-git/contribs9/smeserver-git.spec	2015/02/04 18:29:39	1.1
+++ rpms/smeserver-git/contribs9/smeserver-git.spec	2017/11/28 23:58:34	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-git
-%define version 1.1.0
-%define release 0
+%define version 1.2.0
+%define release 2
 Summary: Centralised Git repositories with setup and configuration through SME Server admin panels.
 Name: %{name}
 Version: %{version}
@@ -17,6 +17,7 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
 Requires: git
 AutoReqProv: no
+Patch1: smeserver-git-1.2.0.bz10464-warn-on-missing-files.patch
 
 %description
 smeserver-git enables centralised git repositories on an SME server and enables 
@@ -27,6 +28,46 @@ installs and enables the git server on t
 host.com/git. Repositories are then available as https://host.com/git/gitrepo.git.
 
 %changelog
+* Tue Nov 28 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.2.0-2.sme
+- fix smeserver-git prevents httpd.conf template expansion  [SME: 10464]
+- now if gitweb is enabled but smeserver-gitweb is not installed a warning is issued
+instead of an error and template consider it disabled. Same thing if gitweb_theme is enabled 
+but smeserver-gitweb-theme is missing.
+
+* Tue Nov 28 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.2.0-0.sme
+- new sources with unix formated line returns
+
+* Wed Feb 01 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-9.sme
+- apply locale 2017-02-02.patch
+
+* Fri Jun 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-8.sme
+- reverting git db to  644 as default-initialize_database will chown it root:admin
+
+* Fri Jun 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-7.sme
+- removing fragment migrate as it should not be used for that [SME: 9619]
+
+* Wed Jun 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-6.sme
+- fix missing ; in migrate fragment 80git to revert db  permissions [SME: 9619]
+
+* Wed Jun 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-5.sme
+- fix too permissive permissions on db accounts networks and git [SME: 9615] [SME: 9616]
+
+* Sat Jun 11 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-4.sme
+- commented out back the rewrite rule on HEAD etc to allow CLI git
+- fix auth not asked with Location after RewriteRule [SME: 9202]
+- add trailing slash to root git url if omited
+- only using git/repo.git or git/gitweb.cgi/repo.git will ask for auth 
+
+* Fri Jun 10 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-3.sme
+- fix allow to see .git short url with gitweb [SME: 9202]
+
+* Wed Mar 09 2016 JP Pialasse <tests@pialasse.com> 1.1.0-2.sme
+- apply locale 2016-03-09 patch
+
+* Wed Feb 17 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-3
+- Fixed erronous error message when updating a group due to 
+  missing check for 'group-modify' in git user access list handling [SME: 9133]
+
 * Fri Jan 30 2015 Marco Hess <marco.hess@through-ip.com> 1.1.0-0
 - Require >= SME9. 
 - Moved /usr/lib/perl5/site_perl to /usr/share/perl5/vendor_perl.
@@ -81,8 +122,10 @@ host.com/git. Repositories are then avai
 
 %prep
 %setup
-mkdir -p root/home/e-smith/files/git/
+%patch1 -p1
 
+
+mkdir -p root/home/e-smith/files/git/
 %build
 perl createlinks
 
@@ -109,11 +152,14 @@ if [ $1 -eq 1 ] ; then
   /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
   /etc/e-smith/events/actions/navigation-conf
 fi
-echo " - Ensuring git repositories configuration database has the right permissions ..."
-chmod 664 /home/e-smith/db/git
 chown admin:www /home/e-smith/files/git
 /etc/rc7.d/S86httpd-e-smith sighup
-echo "---------------------------------------------------------"
+
+# fixing needed  permissions
+# fixing previous mess
+chmod 644 /home/e-smith/db/git
+chmod 640 /home/e-smith/db/accounts
+chmod 640 /home/e-smith/db/networks
 
 %postun
 if [ $1 -eq 0 ] ; then