X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=a379bd2d60562f33a9468c2ea103199c2f5f6cd3;hp=1a95423a9ffcf6843a35f9d897b9dad090f4bed3;hb=14b06c2bf70fc0afdd405e4f444eeb938e4dd1d9;hpb=2fd47d4b19e3eb44c5557628c4a7e0e78ff2a602 diff --git a/git-core.spec b/git-core.spec index 1a95423..a379bd2 100644 --- 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.4.1 +Version: 2.7.2 Release: 1 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz -# Source0-md5: c72b2dcff11ebd25cb4fa488d6279717 +# Source0-md5: 162ddc6c9b243899ad67ebd6b1c166b1 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}-gitweb-lighttpd.conf @@ -31,6 +31,7 @@ Patch1: %{name}-key-bindings.patch Patch2: %{name}-sysconfdir.patch Patch3: cherry-picked-commitlog.patch Patch4: %{name}-svn-exit-errors.patch +Patch5: %{name}-test-grep.patch URL: http://git-scm.com/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -93,7 +94,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define webappdir %{_sysconfdir}/webapps/%{webapp} %define appdir %{_datadir}/%{webapp} %define cgibindir %{_prefix}/lib/cgi-bin -%define gitcoredir %{_libdir}/%{name} +%define gitcoredir %{_prefix}/lib/%{name} +%define _libexecdir %{_prefix}/lib %description "git" can mean anything, depending on your mood. @@ -132,6 +134,9 @@ katalogu. Summary: Documentation for git-core Summary(pl.UTF-8): Dokumentacja do git-core Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description doc Documentation for git-core. @@ -139,9 +144,6 @@ Documentation for git-core. %description doc -l pl.UTF-8 Dokumentacja do git-core. -%description doc -l fr.UTF-8 -Javadoc pour git-core. - %package daemon-inetd Summary: Files necessary to run git-daemon as an inetd service Summary(pl.UTF-8): Pliki niezbędne do uruchomienia git-daemona w trybie usługi inetd @@ -151,6 +153,9 @@ Requires: setup >= 2.4.11-1 Provides: git-core-daemon Obsoletes: git-core-daemon Obsoletes: git-core-daemon-standalone +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description daemon-inetd Git-daemon is a really simple TCP git daemon that can serve git @@ -170,6 +175,9 @@ Requires: %{name} = %{version}-%{release} Provides: git-core-daemon Obsoletes: git-core-daemon Obsoletes: git-core-daemon-inetd +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description daemon-standalone Git-daemon is a really simple TCP git daemon that can serve git @@ -199,6 +207,9 @@ Summary(pl.UTF-8): Napisany w Tcl/Tk interfejs do systemu kontroli wersji Git Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: tk +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description gitk gitk displays changes in a repository or a selected set of commits. @@ -229,6 +240,9 @@ Requires: webserver(access) Requires: webserver(alias) Requires: webserver(cgi) Suggests: webserver(setenv) +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description gitweb This package provides a web interface for browsing git repositories. @@ -246,6 +260,9 @@ Requires: python-pycairo >= 1.0 Requires: python-pygobject Requires: python-pygtk-gtk >= 2:2.8 Suggests: python-gnome-desktop-gtksourceview +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description gitview A GTK+ based repository browser for git. @@ -261,6 +278,9 @@ Requires: %{name} = %{version}-%{release} Requires: tk Requires: xdg-utils Suggests: meld +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description gui Displays changes in a repository or a selected set of commits. This @@ -287,6 +307,9 @@ Summary(pl.UTF-8): Narzędzia Gita do importowania repozytoriów Archa Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: tla +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description arch Git tools for importing Arch repositories. @@ -300,6 +323,9 @@ Summary(pl.UTF-8): Narzędzia Gita do pracy z repozytoriami bzr Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: bzr +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description bzr Git tools for working with bzr repositories. @@ -314,6 +340,9 @@ Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: cvsps >= 2.1-2 Requires: rcs +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description cvs CVS support for Git. @@ -327,6 +356,9 @@ Summary(pl.UTF-8): Narzędzia Gita do pracy z repozytoriami mercuriala Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: mercurial >= 1.8 +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description hg Git tools for working with mercurial repositories. @@ -339,6 +371,9 @@ Summary: Git tools for working with Perforce depots Summary(pl.UTF-8): Narzędzia Gita do pracy z magazynami Perforce'a Group: Development/Tools Requires: %{name} = %{version}-%{release} +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description p4 Git tools for working with Perforce depots. @@ -436,6 +471,7 @@ Moduł trzeba zarejestrować poleceniem: %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p0 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore @@ -556,8 +592,8 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon # paths cleanup -sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon -sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon +sed -e 's,@libdir@/git-core,%{gitcoredir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon +sed -e 's,@libdir@/git-core,%{gitcoredir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon # hardlink ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-receive-pack}