- up to 2.7.4

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

diff --git a/git-core.spec b/git-core.spec
index 280fb23ac4782d2d6324ebf8b08d3c9aaad4b003..cd54e122a0b1e4a7752351db6544a46e69b49d79 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.4.3
+Version:       2.7.4
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
-Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
-# Source0-md5: bde9fc7aa40560fe3b1c8b9c6d170db0
+Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
+# Source0-md5: b0219fcb6d73104361f4fbdba3741d00
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -93,7 +93,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 +133,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 +143,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 +152,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 +174,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 +206,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 +239,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 +259,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 +277,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 +306,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 +322,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 +339,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 +355,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 +370,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.
@@ -556,8 +590,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}