From: Kacper Kornet <draenog@pld-linux.org>
Date: Wed, 5 Sep 2012 01:57:02 +0000 (+0200)
Subject: - up to 0.13.2
X-Git-Tag: auto/th/pld-gitolite-0.13.4-1~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=800f99ee461ebe7c52c8d50bc3ebff44891728da;p=packages%2Fpld-gitolite.git

- up to 0.13.2
- new options for link to gitweb and order of files in emails
- new config file with order of files in emails
---

diff --git a/git.conf b/git.conf
index 108991a..daad25c 100644
--- a/git.conf
+++ b/git.conf
@@ -11,5 +11,7 @@
 	emailprefix = ""
 	emailmaxlines = 10000
 	ciaproject =
+	gitwebroot =
 	specsdir =
 	specsrepo =
+	orderfile = "configs/difforder"
diff --git a/pld-gitolite.spec b/pld-gitolite.spec
index 7c437b9..c86c82e 100644
--- a/pld-gitolite.spec
+++ b/pld-gitolite.spec
@@ -48,7 +48,7 @@ mv draenog-gitolite-scripts-*/* .
 rm -rf $RPM_BUILD_ROOT
 # create directories if necessary
 install -d $RPM_BUILD_ROOT/home/services/%{gituser}/.gitolite/{conf,hooks/common}
-install -d $RPM_BUILD_ROOT/home/services/%{gituser}/bin
+install -d $RPM_BUILD_ROOT/home/services/%{gituser}/{bin,configs}
 
 cp -p %{SOURCE1} %{SOURCE5} $RPM_BUILD_ROOT/home/services/%{gituser}/.gitolite/conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/home/services/%{gituser}/.gitolite.rc
@@ -57,6 +57,8 @@ cp -a hooks/* $RPM_BUILD_ROOT/home/services/%{gituser}/.gitolite/hooks/common
 cp -a adc $RPM_BUILD_ROOT/home/services/%{gituser}
 cp -a bin/* $RPM_BUILD_ROOT/home/services/%{gituser}/bin
 
+echo '*.spec' > $RPM_BUILD_ROOT/home/services/%{gituser}/configs/difforder
+
 install -Dp %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/git
 
 # install additional config for gitweb package
@@ -115,3 +117,5 @@ fi
 %dir /home/services/%{gituser}/bin
 %attr(744,%{gituser},%{gituser}) /home/services/%{gituser}/bin/specscommit.sh
 %attr(744,%{gituser},%{gituser}) /home/services/%{gituser}/bin/pldgithub.py
+%dir /home/services/%{gituser}/configs
+%config(noreplace) %verify(not md5 mtime size) /home/services/%{gituser}/configs/difforder