summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2008-08-27 23:52:33 -0400
committerTodd Zullinger <tmz@pobox.com>2008-12-20 15:57:52 -0500
commitbcf1a7f7da8a343a90af30172a6df18c65a0f649 (patch)
tree2e508456e985c33bf620d8a485cc54b2c7537983
parent642346599c20a5bac4710b848e3951a47ba010fd (diff)
downloadgit-package-bcf1a7f7da8a343a90af30172a6df18c65a0f649.tar.gz
git-package-bcf1a7f7da8a343a90af30172a6df18c65a0f649.tar.xz
git-package-bcf1a7f7da8a343a90af30172a6df18c65a0f649.zip
Install git-* commands in %%{_libexecdir}/git-core, the upstream default
-rw-r--r--git.spec25
-rw-r--r--git.xinetd4
2 files changed, 16 insertions, 13 deletions
diff --git a/git.spec b/git.spec
index 040d620..45cc803 100644
--- a/git.spec
+++ b/git.spec
@@ -1,7 +1,7 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
Version: 1.6.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Core git tools
License: GPLv2
Group: Development/Tools
@@ -134,7 +134,6 @@ Requires: git = %{version}-%{release}, emacs-common
%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
ETC_GITCONFIG=/etc/gitconfig \
- gitexecdir=%{_bindir} \
prefix=%{_prefix} all %{!?_without_docs: doc}
make -C contrib/emacs
@@ -143,7 +142,6 @@ rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
prefix=%{_prefix} mandir=%{_mandir} \
ETC_GITCONFIG=/etc/gitconfig \
- gitexecdir=%{_bindir} \
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
make -C contrib/emacs install \
emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
@@ -165,7 +163,7 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
+(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
@@ -185,6 +183,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
+%dir %{_libexecdir}/git-core/
%doc README COPYING Documentation/*.txt contrib/hooks
%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
%{!?_without_docs: %doc Documentation/howto Documentation/technical}
@@ -193,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
%files svn
%defattr(-,root,root)
-%{_bindir}/*svn*
+%{_libexecdir}/git-core/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }
@@ -201,28 +200,29 @@ rm -rf $RPM_BUILD_ROOT
%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
-%{_bindir}/*cvs*
+%{_bindir}/git-cvsserver
+%{_libexecdir}/git-core/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }
%files arch
%defattr(-,root,root)
%doc Documentation/git-archimport.txt
-%{_bindir}/git-archimport
+%{_libexecdir}/git-core/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
-%{_bindir}/*email*
+%{_libexecdir}/git-core/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%files gui
%defattr(-,root,root)
-%{_bindir}/git-gui
-%{_bindir}/git-citool
+%{_libexecdir}/git-core/git-gui
+%{_libexecdir}/git-core/git-citool
%{_datadir}/git-gui/
%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
%{!?_without_docs: %doc Documentation/git-gui.html}
@@ -247,7 +247,7 @@ rm -rf $RPM_BUILD_ROOT
%files daemon
%defattr(-,root,root)
-%{_bindir}/git-daemon
+%{_libexecdir}/git-core/git-daemon
%config(noreplace)%{_sysconfdir}/xinetd.d/git
/var/lib/git-daemon
@@ -261,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT
# No files for you!
%changelog
+* Sat Dec 20 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.6-2
+- Install git-* commands in %%{_libexecdir}/git-core, the upstream default
+
* Sat Dec 20 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.6-1
- git-1.6.0.6
- Fixes a local privilege escalation bug in gitweb
diff --git a/git.xinetd b/git.xinetd
index dcfae91..a21f130 100644
--- a/git.xinetd
+++ b/git.xinetd
@@ -8,8 +8,8 @@ service git
socket_type = stream
wait = no
user = nobody
- server = /usr/bin/git-daemon
- server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose
+ server = /usr/bin/git
+ server_args = daemon --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose
log_on_failure += USERID
# xinetd doesn't do this by default. bug #195265
flags = IPv6