%define gitexecdir %{_libexecdir}/git
-%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: git
-Version: 1.7.10.4
+Version: 1.8.1.3
Release: 0
License: GPL-2.0
Summary: Fast, scalable, distributed revision control system
Url: http://git-scm.com
-Group: Development/Tools/Version Control
-Source: %{name}-%{version}.tar.bz2
-Source2: sysconfig.git-daemon
-Source3: git-daemon.init
-Source4: git.xinetd
-Source5: usr.share.git-web.gitweb.cgi
-Patch1: git-nohardlink.diff
-Patch2: git-python-install-fix.diff
-Patch3: completion-wordbreaks.diff
-# CVE-2011-2186, bnc#698456
-Patch4: git-prevent_xss-default.diff
+Group: Development/Tools
+Source: %{name}-%{version}.tar.gz
BuildRequires: curl
BuildRequires: expat-devel
BuildRequires: fdupes
%package core
Summary: Core git tools
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: less
Requires: openssh
Requires: perl-Error
-Requires: perl-base = %{perl_version}
+Requires: perl = %{perl_version}
Requires: rsync
%description core
%package svn
Summary: Git tools for importing Subversion repositories
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
Requires: subversion
Requires: subversion-perl
%package cvs
Summary: Git tools for importing CVS repositories
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: cvs
Requires: cvsps
Requires: git-core = %{version}
%package arch
Summary: Git tools for importing Arch repositories
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
# Requires: tla
%package email
Summary: Git tools for sending email
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
# For sending mails over secure SMTP:
Recommends: perl-Authen-SASL
-Recommends: perl-Net-SMTP-SSL,
+Recommends: perl-Net-SMTP-SSL
%description email
Email interface for the GIT version control system.
%package daemon
Summary: Simple Server for Git Repositories
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires(pre): /usr/sbin/useradd
Requires: git-core = %{version}
'git-daemon-export-ok' file.
%package -n gitk
Summary: Git revision tree visualiser
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
Requires: tk >= 8.4
Supplements: packageand(git-core:tk)
%package gui
Summary: Grapical tool for common git operations
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
Requires: tk >= 8.4
Supplements: packageand(git-core:tk)
%package web
Summary: Git Web Interface
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
Supplements: packageand(git-core:apache2)
%package remote-helpers
Summary: Python package for remote helper scripts
-Group: Development/Tools/Version Control
+Group: Development/Tools
Requires: git-core = %{version}
Requires: python
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
cat > .make <<'EOF'
rm -rf %{buildroot}/usr/lib/perl5/site_perl
%perl_process_packlist
find %{buildroot}/%{_mandir} -type f -print0 | xargs -0 chmod 644
+find %{buildroot}/%python_sitelib/ -type f -name *.pyc -print0 | xargs -0 rm
install -m 644 -D contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git.sh
+sed -i "s#$RPM_BUILD_ROOT##g" %{buildroot}/%{gitexecdir}/git-remote-testgit
%find_lang %{name}
cat %{name}.lang >>bin-man-doc-files
# use symlinks instead of hardlinks in sub-commands
%files core -f bin-man-doc-files
%defattr(-,root,root)
+%license COPYING
%{_bindir}/git
%{_datadir}/git-core/
%dir %{gitexecdir}
-%doc README COPYING Documentation/*.txt
+%doc Documentation/*.txt
%{perl_vendorlib}/Git.pm
%{perl_vendorlib}/Git/
%{perl_vendorlib}/Git/*.pm
%{perl_vendorarch}/auto/Git/
-%{_sysconfdir}/bash_completion.d/git.sh
+%attr(0644, root, root) %{_sysconfdir}/bash_completion.d/git.sh
%changelog