--- rpms/smeserver-git/contribs9/smeserver-git.spec	2016/06/22 17:34:22	1.6
+++ 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 5
+%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,11 +17,7 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
 Requires: git
 AutoReqProv: no
-Patch1: smeserver-git-1.1.0-fix_missing_group_modify_event_check.patch
-Patch2: smeserver-git-1.1.0-rewriterules_for_dot_git.patch
-Patch3: smeserver-git-1.1.0-LocationMatch.patch
-Patch4: smeserver-git-1.1.0-db_permissions.patch
-
+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 
@@ -32,6 +28,27 @@ 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]
 
@@ -106,9 +123,7 @@ host.com/git. Repositories are then avai
 %prep
 %setup
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
 
 mkdir -p root/home/e-smith/files/git/
 %build
@@ -137,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 660 /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