From 38338a2d6d88b3df081b82d5a65d94f8d4fc8fa1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 22 Oct 2008 09:01:39 -0400 Subject: Sync with cvs tag git-1_6_0_3-1_fc10 --- .cvsignore | 2 +- git.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4b6d52..99abeff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.1.tar.bz2 +git-1.6.0.3.tar.bz2 diff --git a/git.spec b/git.spec index fb66416..43cdbc7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.1 +Version: 1.6.0.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,11 +11,11 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -90,6 +90,7 @@ Git tools for importing Arch repositories. Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Net::SMTP::SSL) %description email Git tools for sending email. @@ -259,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 +- git-1.6.0.3 +- Drop curl requirement in favor of libcurl (bug 449388) +- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) + * Thu Aug 28 2008 James Bowes 1.6.0.1-1 - git-1.6.0.1 diff --git a/sources b/sources index ce81aef..f2fb1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -264701ebd9036ca2458358f01aa6c093 git-1.6.0.1.tar.bz2 +d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 -- cgit