OBS User unknown 2008-11-20 14:22:38 +00:00 committed by Git OBS Bridge
parent ea5447ad6e
commit c65faadf00
3 changed files with 32 additions and 10 deletions

View File

@ -0,0 +1,11 @@
--- Makefile-dist 2008-11-19 08:53:05.000000000 +0100
+++ Makefile 2008-11-19 08:53:50.000000000 +0100
@@ -1355,7 +1355,7 @@
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
ifndef NO_TCLTK

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 19 08:54:41 CET 2008 - tiwai@suse.de
- install git-shell and git-cvsserver as in the upstream
(bnc#446049)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 4 08:45:59 CET 2008 - olh@suse.de Tue Nov 4 08:45:59 CET 2008 - olh@suse.de

View File

@ -36,7 +36,7 @@ BuildRequires: libopenssl-devel
BuildRequires: sgml-skel BuildRequires: sgml-skel
BuildRequires: xmlto BuildRequires: xmlto
Version: 1.6.0.2 Version: 1.6.0.2
Release: 5 Release: 6
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL v2 or later License: GPL v2 or later
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -47,6 +47,7 @@ Source2: sysconfig.git-daemon
Source3: git-daemon.init Source3: git-daemon.init
Source4: git.xinetd Source4: git.xinetd
Patch: asciidoc.diff Patch: asciidoc.diff
Patch1: git-install-git-shell.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: git-core = %{version} Requires: git-core = %{version}
Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web
@ -242,6 +243,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch -p1 %patch -p1
%patch1
%build %build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@ -279,7 +281,8 @@ install -d -m 755 $RPM_BUILD_ROOT/srv/git
install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
### ###
(find $RPM_BUILD_ROOT%{_libdir}/git -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{_libdir}/git -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
( pushd perl ( pushd perl
perl Makefile.PL perl Makefile.PL
@ -325,6 +328,7 @@ fi
%files cvs %files cvs
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*git-cvs*.txt %doc Documentation/*git-cvs*.txt
%{_bindir}/git-cvs*
%{_libdir}/git/*cvs* %{_libdir}/git/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html } %{!?_without_docs: %doc Documentation/*git-cvs*.html }
@ -381,8 +385,6 @@ fi
%files core -f bin-man-doc-files %files core -f bin-man-doc-files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/git
%{_bindir}/git-*
%{_datadir}/git-core/ %{_datadir}/git-core/
%dir %{_libdir}/git %dir %{_libdir}/git
%doc README COPYING Documentation/*.txt %doc README COPYING Documentation/*.txt
@ -394,6 +396,9 @@ fi
/etc/bash_completion.d/git.sh /etc/bash_completion.d/git.sh
%changelog %changelog
* Wed Nov 19 2008 tiwai@suse.de
- install git-shell and git-cvsserver as in the upstream
(bnc#446049)
* Tue Nov 04 2008 olh@suse.de * Tue Nov 04 2008 olh@suse.de
- use fdupes only if the distribution provides it - use fdupes only if the distribution provides it
- use libopenssl-devel only if the distribution provides it - use libopenssl-devel only if the distribution provides it
@ -433,7 +438,7 @@ fi
* Wed Aug 06 2008 anosek@suse.cz * Wed Aug 06 2008 anosek@suse.cz
- fixed Add git xinetd.d file for ability to use yast2 (bnc#398361) - fixed Add git xinetd.d file for ability to use yast2 (bnc#398361)
- created file git.xinetd to run git under xinetd daemon - created file git.xinetd to run git under xinetd daemon
* Wed Jun 25 2008 dmueller@suse.de * Tue Jun 24 2008 dmueller@suse.de
- update to 1.5.6: - update to 1.5.6:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt
* Mon Jun 16 2008 lnussel@suse.de * Mon Jun 16 2008 lnussel@suse.de
@ -512,7 +517,7 @@ fi
- update to 1.5.3.4: - update to 1.5.3.4:
* submodule support * submodule support
* many new features and bugfixes * many new features and bugfixes
* Tue Aug 07 2007 dmueller@suse.de * Mon Aug 06 2007 dmueller@suse.de
- update to 1.5.2.4: - update to 1.5.2.4:
* "git checkout" failed to switch back and forth between * "git checkout" failed to switch back and forth between
branches, one of which has "frotz -> xyzzy" symlink and branches, one of which has "frotz -> xyzzy" symlink and
@ -528,7 +533,7 @@ fi
- Update to 1.5.2.3: - Update to 1.5.2.3:
* fix many segfaults with the SVN gateway * fix many segfaults with the SVN gateway
* various bugfixes * various bugfixes
* Fri May 18 2007 dmueller@suse.de * Thu May 17 2007 dmueller@suse.de
- Update to 1.5.1.4: - Update to 1.5.1.4:
* GIT <-> SVN gateway * GIT <-> SVN gateway
* New porcelain, much improved index handling * New porcelain, much improved index handling
@ -578,7 +583,7 @@ fi
(former does not exist) (former does not exist)
* Fri Mar 10 2006 pbaudis@suse.cz * Fri Mar 10 2006 pbaudis@suse.cz
- Add Olaf Hering's patch for easier cut'n'pasting. - Add Olaf Hering's patch for easier cut'n'pasting.
* Wed Mar 08 2006 pbaudis@suse.cz * Tue Mar 07 2006 pbaudis@suse.cz
- Update to git-core 1.2.4. - Update to git-core 1.2.4.
- This is a security fix: there was a buffer overflow when checking - This is a security fix: there was a buffer overflow when checking
out a tree with an insanely long symlink. (No Bugzilla id.) out a tree with an insanely long symlink. (No Bugzilla id.)
@ -586,13 +591,13 @@ fi
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Tue Jan 17 2006 pbaudis@suse.cz * Tue Jan 17 2006 pbaudis@suse.cz
- Fix the specfile build (no expat and asciidoc, xmlto problems) - Fix the specfile build (no expat and asciidoc, xmlto problems)
* Tue Jan 17 2006 pbaudis@suse.cz * Mon Jan 16 2006 pbaudis@suse.cz
- Update to git-core 1.1.3. - Update to git-core 1.1.3.
- Modify the specfile so that it looks more like the stock one. - Modify the specfile so that it looks more like the stock one.
- Split bits to subpackages - Split bits to subpackages
* Sun Dec 04 2005 schwab@suse.de * Sun Dec 04 2005 schwab@suse.de
- Fix embedded paths. - Fix embedded paths.
* Thu Oct 06 2005 schwab@suse.de * Wed Oct 05 2005 schwab@suse.de
- Don't build documentation in parallel. - Don't build documentation in parallel.
* Mon Sep 19 2005 schwab@suse.de * Mon Sep 19 2005 schwab@suse.de
- Update to git-core 0.99.7. - Update to git-core 0.99.7.