packages: git-core/git-core.spec, git-core/git-core-sysconfdir.patch (NEW) ...

[draenog]

Author: draenog                      Date: Fri Apr 29 13:50:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- place system wide configuration files in %{_sysconfdir}
- change default directory with templates to /etc/git-core/templates
- do not copy sample hooks to every new repo by default

---- Files affected:
packages/git-core:
   git-core.spec (1.240 -> 1.241) , git-core-sysconfdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.240 packages/git-core/git-core.spec:1.241
--- packages/git-core/git-core.spec:1.240	Wed Apr 27 13:38:46 2011
+++ packages/git-core/git-core.spec	Fri Apr 29 15:50:37 2011
@@ -23,6 +23,7 @@
 Source6:	%{name}.init
 Patch0:		%{name}-tests.patch
 Patch1:		%{name}-key-bindings.patch
+Patch2:		%{name}-sysconfdir.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -371,11 +372,13 @@
 %setup -q -n git-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %configure \
+	--sysconfdir=%{_sysconfdir}/git-core \
 	--with-openssl
 
 echo "BLK_SHA1=1" >> config.mak
@@ -404,6 +407,11 @@
 install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
 install -d $RPM_BUILD_ROOT{%{appdir},%{cgibindir},%{webappdir}}
 install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/git-core
+cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/git-core/gitconfig
+[init]
+	templatedir = /etc/gitolite/templates
+EOF
 
 %{__make} install \
 	INSTALLDIRS=vendor \
@@ -414,6 +422,10 @@
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
+# copy templates except sample hooks
+cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/templates $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates/hooks/*.sample
+
 # header files and lib
 cp -a *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -a compat $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -518,6 +530,7 @@
 %attr(755,root,root) %{_bindir}/git-shell
 %attr(755,root,root) %{_bindir}/git-upload-archive
 %attr(755,root,root) %{_bindir}/git-upload-pack
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/git-core
 
 %if %{with doc}
 %{_mandir}/man1/git-*.1*
@@ -691,6 +704,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241  2011/04/29 13:50:37  draenog
+- place system wide configuration files in %{_sysconfdir}
+- change default directory with templates to /etc/git-core/templates
+- do not copy sample hooks to every new repo by default
+
 Revision 1.240  2011/04/27 11:38:46  draenog
 - up to 1.7.5
 

================================================================
Index: packages/git-core/git-core-sysconfdir.patch
diff -u /dev/null packages/git-core/git-core-sysconfdir.patch:1.1
--- /dev/null	Fri Apr 29 15:50:43 2011
+++ packages/git-core/git-core-sysconfdir.patch	Fri Apr 29 15:50:37 2011
@@ -0,0 +1,45 @@
+diff --git a/Makefile b/Makefile
+index cbc3fce..f5a37b5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -291,15 +291,8 @@ sharedir = $(prefix)/share
+ gitwebdir = $(sharedir)/gitweb
+ template_dir = share/git-core/templates
+ htmldir = share/doc/git-doc
+-ifeq ($(prefix),/usr)
+-sysconfdir = /etc
+ ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
+-else
+-sysconfdir = $(prefix)/etc
+-ETC_GITCONFIG = etc/gitconfig
+-ETC_GITATTRIBUTES = etc/gitattributes
+-endif
+ lib = lib
+ # DESTDIR=
+ pathsep = :
+@@ -1192,6 +1185,12 @@ endif
+ -include config.mak.autogen
+ -include config.mak
+ 
++ifeq ($(prefix),/usr)
++sysconfdir ?= /etc
++else
++sysconfdir ?= etc
++endif
++
+ ifdef CHECK_HEADER_DEPENDENCIES
+ COMPUTE_HEADER_DEPENDENCIES =
+ USE_COMPUTED_HEADER_DEPENDENCIES =
+diff --git a/config.mak.in b/config.mak.in
+index e378534..3006494 100644
+--- a/config.mak.in
++++ b/config.mak.in
+@@ -15,6 +15,7 @@ TCLTK_PATH = @TCLTK_PATH@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
++sysconfdir = @sysconfdir@
+ gitexecdir = @libexecdir@/git-core
+ datarootdir = @datarootdir@
+ template_dir = @datadir@/git-core/templates
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.240&r2=1.241&f=u