X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=git-core.spec;h=013d52fff2c5a366ff597aa857ee371c2dcd9be3;hb=63b8184bab3bc58a99a296364868a246d09f7dd3;hp=e99e7b46b4f98185654e1c3439f9c5c8673bc7cb;hpb=b4f8bcbbe058408fa9c48dfd7d96f167bfcdd86f;p=packages%2Fgit-core.git diff --git a/git-core.spec b/git-core.spec index e99e7b4..013d52f 100644 --- a/git-core.spec +++ b/git-core.spec @@ -14,12 +14,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.35.0 +Version: 2.36.0 Release: 1 License: GPL v2 Group: Development/Tools Source0: https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz -# Source0-md5: 272d8e75a7f309943f62a0826ef799bd +# Source0-md5: a764a4b95dee25362a5f9696d5e0fd81 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}-gitweb-lighttpd.conf @@ -104,8 +104,8 @@ Suggests: less Suggests: openssh-clients Suggests: perl-Git = %{version}-%{release} Suggests: rsync -Obsoletes: git-core-gitview -Obsoletes: python-Git +Obsoletes: git-core-gitview < 2.12.1 +Obsoletes: python-Git < 1.8.5 Conflicts: perl-Git < %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -403,7 +403,7 @@ Summary: Perl interface to the Git version control system Summary(pl.UTF-8): Perlowy interfejs do systemu kontroli wersji Git Group: Development/Languages/Perl Requires: perl-Error -Obsoletes: perl-git-core +Obsoletes: perl-git-core < 1.4.3.5 BuildArch: noarch %description -n perl-Git