up to 2.10.0

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index 17b9e321d30d597f32344a18d6d0f7e763bba35d..3626aa6fdf9625952c7aabff98c916adb3aec9b5 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -13,12 +13,12 @@
 Summary:       Distributed version control system focused on speed, effectivity and usability
 Summary(pl.UTF-8):     Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:          git-core
-Version:       2.8.3
+Version:       2.10.0
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 4a9bda9f14e9c5ce3e7a416e43b74a1b
+# Source0-md5: d99fdf256e7c7bc5d2cb428b48d4e038
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -36,7 +36,11 @@ BuildRequires:       autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: curl-devel
 BuildRequires: expat-devel
+%if "%{pld_release}" == "ac"
+BuildRequires: gettext-devel
+%else
 BuildRequires: gettext-tools
+%endif
 %if %{with gnome_keyring}
 BuildRequires: libgnome-keyring-devel
 BuildRequires: pkgconfig
@@ -49,7 +53,8 @@ BuildRequires:        python-devel
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.673
-BuildRequires: tcl
+# wish
+BuildRequires: tk
 BuildRequires: zlib-devel
 %if %{with doc}
 BuildRequires: asciidoc >= 7.1.2-3
@@ -72,7 +77,6 @@ Conflicts:    pdksh < 5.2.14-46
 Requires:      grep
 # git-pull: printf
 Requires:      coreutils
-Requires:      openssh-clients
 Requires:      perl-Error
 Requires:      perl-Git = %{version}-%{release}
 Requires:      sed
@@ -82,6 +86,7 @@ Suggests:     git-core-hg
 Suggests:      git-core-p4
 Suggests:      git-core-svn
 Suggests:      less
+Suggests:      openssh-clients
 Suggests:      rsync
 Obsoletes:     python-Git
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -399,6 +404,7 @@ Summary:    Git tools for sending email
 Summary(pl.UTF-8):     Narzędzia Gita do wysyłania poczty
 Group:         Development/Tools
 Requires:      %{name} = %{version}-%{release}
+Suggests:      perl-Net-SMTP-SSL
 
 %description email
 Git tools for sending email.
@@ -857,6 +863,12 @@ fi
 %if %{with doc}
 %{_mandir}/man1/git-svn.1*
 %endif
+%{_mandir}/man3/Git::SVN::Editor.3pm*
+%{_mandir}/man3/Git::SVN::Fetcher.3pm*
+%{_mandir}/man3/Git::SVN::Memoize::YAML.3pm*
+%{_mandir}/man3/Git::SVN::Prompt.3pm*
+%{_mandir}/man3/Git::SVN::Ra.3pm*
+%{_mandir}/man3/Git::SVN::Utils.3pm*
 
 %files email
 %defattr(644,root,root,755)
@@ -877,7 +889,8 @@ fi
 %dir %{perl_vendorlib}/Git
 %{perl_vendorlib}/Git/I18N.pm
 %{perl_vendorlib}/Git/IndexInfo.pm
-%{_mandir}/man3/Git*.3pm*
+%{_mandir}/man3/Git.3pm*
+%{_mandir}/man3/Git::I18N.3pm*
 
 %if %{with gnome_keyring}
 %files -n gnome-keyring-git-core