diff --git a/git-1.5.6.5.tar.bz2 b/git-1.5.6.5.tar.bz2 deleted file mode 100644 index 1a60af1..0000000 --- a/git-1.5.6.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e -size 1743402 diff --git a/git-1.6.0.2.tar.bz2 b/git-1.6.0.2.tar.bz2 new file mode 100644 index 0000000..dcdda99 --- /dev/null +++ b/git-1.6.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8 +size 1865485 diff --git a/git.changes b/git.changes index f3a185e..648ad6a 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 25 16:08:40 CEST 2008 - tiwai@suse.de + +- updated to 1.6.0.2: + Mostly small bug fixes, see details in + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.2.txt + +------------------------------------------------------------------- +Thu Sep 25 16:04:22 CEST 2008 - tiwai@suse.de + +- fix file selections of git-core package +- use symlinks for git sub-commands instead of hardlinks to make + build system happy + +------------------------------------------------------------------- +Tue Sep 9 12:18:09 CEST 2008 - tiwai@suse.de + +- updated to 1.6.0: + * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt +- updated to 1.6.0.1: + * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.1.txt +- install git subcommands now to libdir/git + users have to set up properly if they want to keep the old style + (refer git --execpath) + +------------------------------------------------------------------- +Tue Sep 9 11:38:39 CEST 2008 - lnussel@suse.de + +- split off gui and web subpackages + ------------------------------------------------------------------- Mon Aug 18 11:42:39 CEST 2008 - schwab@suse.de diff --git a/git.spec b/git.spec index d1fe451..bfcb40b 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.5.6.5) +# spec file for package git (Version 1.6.0.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: git -BuildRequires: asciidoc curl-devel libopenssl-devel sgml-skel xmlto -Version: 1.5.6.5 -Release: 8 +BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto +Version: 1.6.0.2 +Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -32,8 +32,9 @@ Source2: sysconfig.git-daemon Source3: git-daemon.init Source4: git.xinetd BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: git-core = %{version} git-svn = %{version} git-cvs = %{version} -Requires: git-arch = %{version} git-email = %{version} gitk = %{version} +Requires: git-core = %{version} +Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web +Suggests: git-daemon %description Git is a fast, scalable, distributed revision control system with an @@ -142,22 +143,16 @@ Authors: %package daemon License: GPL v2 or later -Summary: Fast, scalable, distributed revision control system +Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control Requires: git-core = %{version} Provides: git-core:/usr/bin/git-daemon PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq %description daemon -Git is a fast, scalable, distributed revision control system with an -unusually rich command set that provides both high-level operations and -full access to internals. - -This package itself only provides the README of git but with the -packages it requires, it brings you a complete Git environment -including GTK and email interfaces and tools for importing source code -repositories from other revision control systems such as subversion, -CVS, and GNU arch. +A really simple TCP git daemon. In the default configuration it allows +read only access to repositories in /srv/git/ that contain the +'git-daemon-export-ok' file. @@ -170,6 +165,7 @@ License: GPL v2 or later Summary: Git revision tree visualiser Group: Development/Tools/Version Control Requires: git-core = %{version}, tk >= 8.4 +Supplements: packageand(git-core:tk) %description -n gitk Grapical tool for visualization of revision trees of projects @@ -186,6 +182,48 @@ Authors: Linus Torvalds Junio C Hamano +%package gui +License: GPL v2 or later +Summary: Grapical tool for common git operations +Group: Development/Tools/Version Control +Requires: git-core = %{version}, tk >= 8.4 +Supplements: packageand(git-core:tk) + +%description gui +A Tcl/Tk based graphical user interface to Git. git-gui focuses on +allowing users to make changes to their repository by making new +commits, amending existing ones, creating branches, performing local +merges, and fetching/pushing to remote repositories. + +Unlike gitk, git-gui focuses on commit generation and single file +annotation, and does not show project history. It does however supply +menu actions to start a gitk session from within git-gui. + + + +Authors: +-------- + Linus Torvalds + +%package web +License: GPL v2 or later +Summary: Git Web Interface +Group: Development/Tools/Version Control +Requires: git-core = %{version} +Supplements: packageand(git-core:apache2) + +%description web +CGI script that allows browsing git repositories via web interface. + +The apache2 configuration contained in this package installs a virtual +directory /git/ that calls the cgi script. + + + +Authors: +-------- + Linus Torvalds + %prep %setup -q @@ -196,11 +234,13 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ + gitexecdir=%{_libdir}/git \ all %{!?_without_docs: doc} %{?jobs:-j %jobs} %install make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ prefix=%{_prefix} mandir=%{_mandir} \ + gitexecdir=%{_libdir}/git \ install %{!?_without_docs: install-doc} ### git-web cp gitweb/INSTALL INSTALL.gitweb @@ -223,8 +263,8 @@ install -d -m 755 $RPM_BUILD_ROOT/srv/git install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git ### -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon" | 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" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> 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 ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor @@ -233,6 +273,8 @@ rm -rf ${RPM_BUILD_ROOT}/usr/lib/perl5/site_perl %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh +# use symlinks instead of hardlinks in sub-commands +%fdupes -s $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -257,7 +299,7 @@ fi %files svn %defattr(-,root,root) -%{_bindir}/*svn* +%{_libdir}/git/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -265,28 +307,28 @@ fi %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt -%{_bindir}/*cvs* +%{_libdir}/git/*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 +%{_libdir}/git/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* +%{_libdir}/git/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files daemon %defattr(-,root,root) %doc Documentation/*daemon*.txt -%{_bindir}/*daemon* +%{_libdir}/git/*daemon* /etc/init.d/git-daemon %{_sbindir}/rcgit-daemon %dir /srv/git @@ -298,30 +340,60 @@ fi %files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt -%{_bindir}/*gitk* +%{_bindir}/gitk /usr/share/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } -%files core -f bin-man-doc-files +%files gui %defattr(-,root,root) -%{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } -/var/adm/perl-modules/%{name} -%{perl_vendorlib}/Error.pm -%{perl_vendorlib}/Git.pm -%{perl_vendorarch}/auto/Git/ +%doc Documentation/*gui*.txt +%{_libdir}/git/git-gui /usr/share/git-gui -/etc/bash_completion.d/git.sh -#TODO: split into subpackage +%{!?_without_docs: %{_mandir}/man1/*gui*.1*} +%{!?_without_docs: %doc Documentation/*gui*.html } + +%files web +%defattr(-,root,root) %doc README.gitweb INSTALL.gitweb %dir /etc/apache2 %dir /etc/apache2/conf.d %config(noreplace) /etc/apache2/conf.d/gitweb.conf /usr/share/git-web +%files core -f bin-man-doc-files +%defattr(-,root,root) +%{_bindir}/git +%{_bindir}/git-* +%{_datadir}/git-core/ +%dir %{_libdir}/git +%doc README COPYING Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html } +/var/adm/perl-modules/%{name} +%{perl_vendorlib}/Error.pm +%{perl_vendorlib}/Git.pm +%{perl_vendorarch}/auto/Git/ +/etc/bash_completion.d/git.sh + %changelog +* Thu Sep 25 2008 tiwai@suse.de +- updated to 1.6.0.2: + Mostly small bug fixes, see details in + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.2.txt +* Thu Sep 25 2008 tiwai@suse.de +- fix file selections of git-core package +- use symlinks for git sub-commands instead of hardlinks to make + build system happy +* Tue Sep 09 2008 tiwai@suse.de +- updated to 1.6.0: + * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt +- updated to 1.6.0.1: + * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.1.txt +- install git subcommands now to libdir/git + users have to set up properly if they want to keep the old style + (refer git --execpath) +* Tue Sep 09 2008 lnussel@suse.de +- split off gui and web subpackages * Mon Aug 18 2008 schwab@suse.de - Fix name of completions file. * Tue Aug 12 2008 tiwai@suse.de