From e143e37f36051b8aca02696eb7d634e07f6dacb59e6f8bad56424b78af86f5ff Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 18 May 2007 00:07:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=2 --- git-1.4.3.4.tar.bz2 | 3 --- git-1.5.1.4.tar.bz2 | 3 +++ git.changes | 12 ++++++++++++ git.spec | 37 ++++++++++++++++++++++++++----------- gitweb-suse.diff | 24 ------------------------ 5 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 git-1.4.3.4.tar.bz2 create mode 100644 git-1.5.1.4.tar.bz2 delete mode 100644 gitweb-suse.diff diff --git a/git-1.4.3.4.tar.bz2 b/git-1.4.3.4.tar.bz2 deleted file mode 100644 index cd2de75..0000000 --- a/git-1.4.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08b842e62019b7fca5e659e1d65807707a3bef5207b0ca65d85b840b5599a318 -size 859033 diff --git a/git-1.5.1.4.tar.bz2 b/git-1.5.1.4.tar.bz2 new file mode 100644 index 0000000..2be7ca7 --- /dev/null +++ b/git-1.5.1.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d65197647592779c8932a44f6e390412492d350aa637af5d097ab46e429bbf0 +size 1126258 diff --git a/git.changes b/git.changes index 2cf30c1..ea9535a 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri May 18 00:34:20 CEST 2007 - dmueller@suse.de + +- Update to 1.5.1.4: + * GIT <-> SVN gateway + * New porcelain, much improved index handling + * git-config + * Bare repositories refuse commands that need a working tree + * packed ref support + * 3-way merges can be done without rcs + * python dependency dropped + ------------------------------------------------------------------- Sat Nov 18 04:46:49 CET 2006 - pbaudis@suse.cz diff --git a/git.spec b/git.spec index 7942d4b..28bf72d 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # -# spec file for package git (Version 1.4.3.4) +# spec file for package git (Version 1.5.1.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,14 +12,13 @@ Name: git BuildRequires: asciidoc curl-devel sgml-skel xmlto -Version: 1.4.3.4 -Release: 3 +Version: 1.5.1.4 +Release: 1 Summary: git - a source code management tool License: GNU General Public License (GPL) Group: Development/Tools/Version Control URL: http://www.kernel.org/pub/software/scm/git/ Source0: git-%{version}.tar.bz2 -Patch0: gitweb-suse.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk @@ -42,7 +41,7 @@ Authors: %package core Summary: git-core--a Source Code Management Tool Group: Development/Tools/Version Control -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh, python >= 2.3 +Requires: rsync, curl, less, openssh %description core This is an extremely fast directory content manager. It is intended to @@ -62,6 +61,7 @@ Authors: Summary: git-svn - Git tools for importing Subversion repositories Group: Development/Tools/Version Control Requires: git-core = %{version}-%{release}, subversion +Requires: subversion-perl %description svn Tools for importing Subversion repositories to the Git version control @@ -138,11 +138,14 @@ Authors: %prep %setup -%patch0 %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ - prefix=%{_prefix} all %{!?_without_docs: doc} +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + GITWEB_CONFIG="/etc/gitweb.conf" \ + GITWEB_PROJECTROOT="/srv/git" \ + WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ + prefix=%{_prefix} mandir=%{_mandir} \ + all %{!?without_docs: doc} %{?jobs:-j %jobs} %install rm -rf $RPM_BUILD_ROOT @@ -156,7 +159,10 @@ cp gitweb/gitweb.cgi $RPM_BUILD_ROOT/srv/www/cgi-bin/gitweb.cgi %if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif -make -C perl DESTDIR=${RPM_BUILD_ROOT} install_vendor +( pushd perl + perl Makefile.PL + make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor +) 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 @@ -215,7 +221,16 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/Git.pm %{perl_vendorarch}/auto/Git/ -%changelog -n git +%changelog +* Fri May 18 2007 - dmueller@suse.de +- Update to 1.5.1.4: + * GIT <-> SVN gateway + * New porcelain, much improved index handling + * git-config + * Bare repositories refuse commands that need a working tree + * packed ref support + * 3-way merges can be done without rcs + * python dependency dropped * Sat Nov 18 2006 - pbaudis@suse.cz - Fix build failure from previous change (trivial omission) * Fri Nov 17 2006 - pbaudis@suse.cz diff --git a/gitweb-suse.diff b/gitweb-suse.diff deleted file mode 100644 index a06696b..0000000 --- a/gitweb-suse.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru git-1.4.3/Makefile git-1.4.3+suse/Makefile ---- Makefile 2006-10-19 01:32:58.000000000 +0200 -+++ Makefile 2006-10-19 02:36:46.000000000 +0200 -@@ -123,7 +123,7 @@ - GITWEB_CONFIG = gitweb_config.perl - GITWEB_HOME_LINK_STR = projects - GITWEB_SITENAME = --GITWEB_PROJECTROOT = /pub/git -+GITWEB_PROJECTROOT = /srv/git - GITWEB_EXPORT_OK = - GITWEB_STRICT_EXPORT = - GITWEB_BASE_URL = -diff -ru git-1.4.3/gitweb/gitweb.perl git-1.4.3+suse/gitweb/gitweb.perl ---- gitweb/gitweb.perl 2006-10-19 01:32:58.000000000 +0200 -+++ gitweb/gitweb.perl 2006-10-19 02:37:02.000000000 +0200 -@@ -28,7 +28,7 @@ - our $GIT = "++GIT_BINDIR++/git"; - - # absolute fs-path which will be prepended to the project path --#our $projectroot = "/pub/scm"; -+#our $projectroot = "/srv/git"; - our $projectroot = "++GITWEB_PROJECTROOT++"; - - # target of the home link on top of all pages