Summary: The stupid content tracker
Summary(pl.UTF-8): Prymitywne narzędzie do śledzenia treści
Name: git-core
-Version: 1.6.5.2
+Version: 1.7.0.4
Release: 1
License: GPL v2
Group: Development/Tools
Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5: 99708c449b23433136dbdfa38bd16d80
+# Source0-md5: 1cc8b2aea57e5e999ccac18ae355f760
Source1: %{name}-gitweb.conf
Source2: %{name}-gitweb-httpd.conf
Source3: %{name}.sysconfig
Source4: %{name}.inet
Source5: %{name}.init
+Patch0: %{name}-tests.patch
URL: http://git-scm.com/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: curl-devel
-BuildRequires: docbook-dtd45-xml
BuildRequires: expat-devel
BuildRequires: gettext-devel
BuildRequires: openssl-devel
-BuildRequires: perl-Error
+BuildRequires: perl-Error > 0.15
BuildRequires: perl-base
-BuildRequires: python
+BuildRequires: python-devel
BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: zlib-devel
%if %{with doc}
BuildRequires: asciidoc >= 7.1.2-3
+BuildRequires: docbook-dtd45-xml
BuildRequires: xmlto
%endif
%if %{with tests}
Requires: sed
Suggests: git-core-cvs
Suggests: git-core-svn
+Suggests: less
+Suggests: rsync
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# html docs have links to txt files
Nie robi wiele, ale to, co "robi", to wydajne śledzenie zawartości
katalogu.
+%package doc
+Summary: Documentation for git-core
+Summary(pl.UTF-8): Dokumentacja do git-core
+Group: Documentation
+
+%description doc
+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
%description cvs -l pl.UTF-8
Obsługa CVS dla Git.
+%package arch
+Summary: Git tools for importing Arch repositories
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: tla
+
+%description arch
+Git tools for importing Arch repositories.
+
+%package email
+Summary: Git tools for sending email
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+
+%description email
+Git tools for sending email.
+
%package -n bash-completion-git
Summary: bash-completion for git
Summary(pl.UTF-8): bashowe uzupełnianie nazw dla gita
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: %{name} = %{version}-%{release}
Obsoletes: perl-git-core
%description -n perl-Git
specjalne metody do łatwego wykonywania operacji nietrywialnych do
wykonania przy użyciu ogólnego interfejsu poleceń.
+%package -n python-Git
+Summary: Python interface to the Git version control system
+Summary(pl.UTF-8): Pythonowy interfejs do systemu kontroli wersji Git
+Group: Development/Languages/Python
+
+%description -n python-Git
+This module provides Python scripts easy way to interface the Git
+version control system.
+
+%description -n python-Git -l pl.UTF-8
+Ten moduł umożliwia skryptom Pythonowym współpracę z systemem kontroli
+wersji Git.
+
%package -n vim-syntax-gitcommit
Summary: Vim syntax: gitcommit
Summary(pl.UTF-8): Składnia dla Vima: gitcommit
%prep
%setup -q -n git-%{version}
+%patch0 -p1
%build
%{__aclocal}
%configure \
--with-openssl
+echo "BLK_SHA1=1" >> config.mak
+
%{__make} \
- BLK_SHA1=1 \
INSTALLDIRS=vendor \
GITWEB_CONFIG="%{webappdir}/gitweb.conf" \
GITWEB_PROJECTROOT="/var/lib/git" \
GITWEB_LOGO="/gitweb/git-logo.png" \
GITWEB_FAVICON="/gitweb/git-favicon.png"
-%{?with_doc:%{__make} -C Documentation}
+# use DOCBOOK_XSL_172=1 to fix 'the ".ft C" problem' in generated manpages.
+%{?with_doc:%{__make} -C Documentation V=1 DOCBOOK_XSL_172=1}
%if %{with tests}
%if %{without tests_cvs}
-rm t/t*cvs*.sh
+rm t/t*cvs*.sh || :
%endif
%{__make} test
%endif
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
install -d $RPM_BUILD_ROOT{%{appdir},%{cgibindir},%{webappdir}}
-install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
%{__make} install \
%endif
# header files and lib
-install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
-install libgit.a $RPM_BUILD_ROOT%{_libdir}
-install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
+cp -a *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -a xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
+cp -a libgit.a $RPM_BUILD_ROOT%{_libdir}
+cp -a xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
# bash completion
-install contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+cp -a contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
# vim syntax
-cat > $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles/syntax/gitcommit.vim << 'EOF'
+install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax
+cat > $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax/gitcommit.vim << 'EOF'
autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase
EOF
# gitweb
-install gitweb/*.css gitweb/*.png $RPM_BUILD_ROOT%{appdir}
-install gitweb/gitweb.cgi $RPM_BUILD_ROOT%{cgibindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+install -p gitweb/gitweb.cgi $RPM_BUILD_ROOT%{cgibindir}
+cp -a gitweb/*.css gitweb/*.png $RPM_BUILD_ROOT%{appdir}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
# gitview
-install contrib/gitview/gitview $RPM_BUILD_ROOT%{_bindir}
+install -p contrib/gitview/gitview $RPM_BUILD_ROOT%{_bindir}
# git-daemon related files
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+install -p %{SOURCE5} $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
+# hardlink
+ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-receive-pack}
+ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-upload-archive}
+ln -f $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/git-shell
+ln -f $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/git-upload-pack
+
# remove unneeded files
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Error.pm
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/private-Error.3*
+rm $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
+%py_postclean
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc README contrib
+%attr(755,root,root) %{_bindir}/git
+%attr(755,root,root) %{_bindir}/git-receive-pack
+%attr(755,root,root) %{_bindir}/git-shell
+%attr(755,root,root) %{_bindir}/git-upload-archive
+%attr(755,root,root) %{_bindir}/git-upload-pack
+
%if %{with doc}
-%doc Documentation/RelNotes*
-%doc Documentation/*.html Documentation/howto Documentation/technical
%{_mandir}/man1/git-*.1*
%exclude %{_mandir}/man1/git-svn.1*
%exclude %{_mandir}/man1/git-cvs*.1*
%{_mandir}/man7/gittutorial.7*
%{_mandir}/man7/gitworkflows.7*
%endif
-%attr(755,root,root) %{_bindir}/git
-%attr(755,root,root) %{_bindir}/git-*
+
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/*-*
%attr(755,root,root) %{_libdir}/%{name}/git
+
%exclude %{_libdir}/%{name}/git-gui
%exclude %{_libdir}/%{name}/git-svn
+%exclude %{_libdir}/%{name}/git-archimport
%exclude %{_libdir}/%{name}/git-cvs*
+%exclude %{_libdir}/%{name}/*email*
+
%{_datadir}/%{name}
+
%{_localstatedir}/lib/git
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc Documentation/RelNotes*
+%doc Documentation/*.html Documentation/howto Documentation/technical
+%endif
+
%files daemon-inetd
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/git-daemon
%dir %{_datadir}/gitk/lib/msgs
%lang(de) %{_datadir}/gitk/lib/msgs/de.msg
%lang(es) %{_datadir}/gitk/lib/msgs/es.msg
+%lang(fr) %{_datadir}/gitk/lib/msgs/fr.msg
+%lang(hu) %{_datadir}/gitk/lib/msgs/hu.msg
%lang(it) %{_datadir}/gitk/lib/msgs/it.msg
+%lang(ja) %{_datadir}/gitk/lib/msgs/ja.msg
%lang(ru) %{_datadir}/gitk/lib/msgs/ru.msg
%lang(sv) %{_datadir}/gitk/lib/msgs/sv.msg
%{_datadir}/git-gui/lib/*.js
%{_datadir}/git-gui/lib/*.tcl
%lang(de) %{_datadir}/git-gui/lib/msgs/de.msg
+%lang(el) %{_datadir}/git-gui/lib/msgs/el.msg
%lang(fr) %{_datadir}/git-gui/lib/msgs/fr.msg
%lang(hu) %{_datadir}/git-gui/lib/msgs/hu.msg
%lang(it) %{_datadir}/git-gui/lib/msgs/it.msg
%files cvs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/git-cvsserver
%attr(755,root,root) %{_libdir}/%{name}/git-cvs*
%if %{with doc}
%{_mandir}/man1/git-cvs*.1*
%{_mandir}/man7/gitcvs-migration.7*
%endif
+%files arch
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/git-archimport
+%if %{with doc}
+%{_mandir}/man1/git-archimport.1*
+%endif
+
+%files email
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/*email*
+%if %{with doc}
+%{_mandir}/man1/*email*.1*
+%endif
+
%files -n bash-completion-git
%defattr(644,root,root,755)
%{_sysconfdir}/bash_completion.d/*
%{perl_vendorlib}/Git.pm
%{_mandir}/man3/Git.3pm*
+%files -n python-Git
+%defattr(644,root,root,755)
+%{py_sitescriptdir}/git_remote_helpers*.egg-info
+%dir %{py_sitescriptdir}/git_remote_helpers
+%{py_sitescriptdir}/git_remote_helpers/*.py[co]
+%dir %{py_sitescriptdir}/git_remote_helpers/git
+%{py_sitescriptdir}/git_remote_helpers/git/*.py[co]
+
%files -n vim-syntax-gitcommit
%defattr(644,root,root,755)
%doc contrib/vim/README
-%{_datadir}/vim/vimfiles/syntax/*
+%{_datadir}/vim/vimfiles/syntax/*.vim
projects / packages / git-core.git / blobdiff